From 84e18c10c0ec3af911735f1793d124c3f40987c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pinkava?= Date: Sun, 20 Oct 2024 13:49:43 +0200 Subject: [PATCH] Add helm chart values for --aws-vpc-tags argument --- helm/aws-load-balancer-controller/Chart.yaml | 2 +- helm/aws-load-balancer-controller/README.md | 1 + helm/aws-load-balancer-controller/templates/deployment.yaml | 3 +++ helm/aws-load-balancer-controller/values.yaml | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/helm/aws-load-balancer-controller/Chart.yaml b/helm/aws-load-balancer-controller/Chart.yaml index 1f1b4e9ba..48f0a7eca 100644 --- a/helm/aws-load-balancer-controller/Chart.yaml +++ b/helm/aws-load-balancer-controller/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: aws-load-balancer-controller description: AWS Load Balancer Controller Helm chart for Kubernetes -version: 1.11.0 +version: 1.11.1 appVersion: v2.11.0 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png diff --git a/helm/aws-load-balancer-controller/README.md b/helm/aws-load-balancer-controller/README.md index a86383dba..4b544f58c 100644 --- a/helm/aws-load-balancer-controller/README.md +++ b/helm/aws-load-balancer-controller/README.md @@ -212,6 +212,7 @@ The default values set by the application itself can be confirmed [here](https:/ | `ingressClassParams.spec` | IngressClassParams defined ingress specifications | {} | | `region` | The AWS region for the kubernetes cluster | None | | `vpcId` | The VPC ID for the Kubernetes cluster | None | +| `vpcTags` | This is alternative to vpcId. Set this when your pods are unable to use the metadata service to determine VPC automatically. | None | `awsApiEndpoints` | Custom AWS API Endpoints | None | | `awsApiThrottle` | Custom AWS API throttle settings | None | | `awsMaxRetries` | Maximum retries for AWS APIs | None | diff --git a/helm/aws-load-balancer-controller/templates/deployment.yaml b/helm/aws-load-balancer-controller/templates/deployment.yaml index 4506d489e..49e228975 100644 --- a/helm/aws-load-balancer-controller/templates/deployment.yaml +++ b/helm/aws-load-balancer-controller/templates/deployment.yaml @@ -173,6 +173,9 @@ spec: {{- if .Values.loadBalancerClass }} - --load-balancer-class={{ .Values.loadBalancerClass }} {{- end }} + {{- if .Values.vpcTags }} + - --aws-vpc-tags={{ include "aws-load-balancer-controller.convertMapToCsv" .Values.vpcTags | trimSuffix "," }} + {{- end }} {{- if or .Values.env .Values.envSecretName }} env: {{- if .Values.env}} diff --git a/helm/aws-load-balancer-controller/values.yaml b/helm/aws-load-balancer-controller/values.yaml index c2f465bcd..79c29fb02 100644 --- a/helm/aws-load-balancer-controller/values.yaml +++ b/helm/aws-load-balancer-controller/values.yaml @@ -161,6 +161,10 @@ region: # The VPC ID for the Kubernetes cluster. Set this manually when your pods are unable to use the metadata service to determine this automatically vpcId: +# This is alternative to vpcId. Set this when your pods are unable to use the metadata service to determine VPC automatically. +vpcTags: {} +# Name: tagValue + # Custom AWS API Endpoints (serviceID1=URL1,serviceID2=URL2) awsApiEndpoints: