Merge pull request #3770 from huonguyenlt/feat/add-envFrom

Move envFrom to the correct position and update example

Author: k8s-ci-robot

helm/aws-load-balancer-controller/templates/deployment.yaml

@@ -170,17 +170,14 @@ spec:
         {{- if .Values.loadBalancerClass }}
         - --load-balancer-class={{ .Values.loadBalancerClass }}
         {{- end }}
-        {{- if or .Values.env .Values.envSecretName .Values.envFrom }}
+        {{- if or .Values.env .Values.envSecretName }}
         env:
         {{- if .Values.env}}
         {{- range $key, $value := .Values.env }}
         - name: {{ $key }}
           value: "{{ $value }}"
         {{- end }}
         {{- end }}
-        {{- if .Values.envFrom }}
-        {{ .Values.envFrom | toYaml | nindent 8 }}
-        {{- end }}
         {{- if .Values.envSecretName  }}
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
@@ -196,6 +193,10 @@ spec:
               optional: true
         {{- end }}
         {{- end }}
+        {{- if .Values.envFrom }}
+        envFrom:
+        {{- toYaml .Values.envFrom | nindent 10 }}
+        {{- end }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 10 }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

helm/aws-load-balancer-controller/values.yaml

@@ -282,10 +282,9 @@ env:
 # envSecretName: aws-secret
 
 # Use envFrom to set environment variables from a Secret or ConfigMap
-envFrom: 
-  # valueFrom:
-  #   - secretKeyRef:
-  #       name: aws-load-balancer-controller
+# envFrom:
+#   - secretRef:
+#       name: my-secret
 
 # Specifies if aws-load-balancer-controller should be started in hostNetwork mode.
 # This is required if using a custom CNI where the managed control plane nodes are unable to initiate