Merge pull request #3906 from pinkavaj/pi-args

Add helm chart configuration for --aws-vpc-tags argument

Author: k8s-ci-robot

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                                              |

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}}

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: