rework to be able to specify secret name

Author: stelucz

helm/aws-load-balancer-controller/README.md

@@ -231,7 +231,7 @@ The default values set by the application itself can be confirmed [here](https:/
 | `externalManagedTags`                          | Specifies the list of tag keys on AWS resources that are managed externally                                                                                                                                            | `[]`                                              |
 | `livenessProbe`                                | Liveness probe settings for the controller                                                                                                                                                                             | (see `values.yaml`)                               |
 | `env`                                          | Environment variables to set for aws-load-balancer-controller pod                                                                                                                                                      | None                                              |
-| `envFromSecret`                                | If `true`, use Environment variables from Secret (aws-secret) for aws-load-balancer-controller pod similarly as The EBS CSI Driver does.                                                                               | `false`                                           |
+| `envSecretName`                                | Environment variables credentials from Secret (aws-secret) for aws-load-balancer-controller pod similarly as The EBS CSI Driver does.                                                                               | `false`                                           |
 | `hostNetwork`                                  | If `true`, use hostNetwork                                                                                                                                                                                             | `false`                                           |
 | `dnsPolicy`                                    | Set dnsPolicy if required                                                                                                                                                                                              | `ClusterFirst`                                    |
 | `extraVolumeMounts`                            | Extra volume mounts for the pod                                                                                                                                                                                        | `[]`                                              |

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

@@ -149,25 +149,25 @@ spec:
         {{- if ne .Values.defaultTargetType "instance" }}
         - --default-target-type={{ .Values.defaultTargetType }}
         {{- end }}
-        {{- if or .Values.env (.Values.envFromSecret | default false) }}
+        {{- if or .Values.env .Values.envSecretName }}
         env:
         {{- if .Values.env}}
         {{- range $key, $value := .Values.env }}
         - name: {{ $key }}
           value: "{{ $value }}"
         {{- end }}
         {{- end }}
-        {{- if .Values.envFromSecret | default false }}
+        {{- if .Values.envSecretName  }}
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
             secretKeyRef:
-              name: aws-secret
+              name: {{ .Values.envSecretName }}
               key: key_id
               optional: true
         - name: AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: aws-secret
+              name: {{ .Values.envSecretName }}
               key: access_key
               optional: true
         {{- end }}

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

@@ -247,8 +247,8 @@ env:
   # ENV_1: ""
   # ENV_2: ""
 
-# Use Environment variables from Secret (aws-secret) for aws-load-balancer-controller pod similarly as The EBS CSI Driver does.
-# envFromSecret: true
+# Use Environment variables credentials from Secret (aws-secret) for aws-load-balancer-controller pod similarly as The EBS CSI Driver does.
+# envSecretName: aws-secret
 
 # Specifies if aws-load-balancer-controller should be started in hostNetwork mode.
 #