Merge pull request #1165 from cnmcavoy/cnmcavoy/helm-volumes-and-mounts

Expose env, volume, and volume mounts in helm chart for the efs controller and deamonset

Author: seanzatzdev-amazon

charts/aws-efs-csi-driver/templates/controller-deployment.yaml

@@ -93,9 +93,15 @@ spec:
             - name: AWS_USE_FIPS_ENDPOINT
               value: "true"
             {{- end }}
+            {{- with .Values.controller.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
+            {{- with .Values.controller.volumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           ports:
             - name: healthz
               containerPort: {{ .Values.controller.healthPort }}
@@ -150,6 +156,9 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
+            {{- with .Values.controller.volumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           {{- with .Values.sidecars.livenessProbe.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
@@ -160,6 +169,9 @@ spec:
       volumes:
         - name: socket-dir
           emptyDir: {}
+        {{- with .Values.controller.volumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- with .Values.controller.affinity }}
       affinity: {{- toYaml . | nindent 8 }}
       {{- end }}

charts/aws-efs-csi-driver/templates/node-daemonset.yaml

@@ -88,6 +88,9 @@ spec:
             - name: AWS_USE_FIPS_ENDPOINT
               value: "true"
             {{- end }}
+            {{- with .Values.node.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet
@@ -100,6 +103,9 @@ spec:
               mountPath: /var/amazon/efs
             - name: efs-utils-config-legacy
               mountPath: /etc/amazon/efs-legacy
+            {{- with .Values.node.volumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           ports:
             - name: healthz
               containerPort: {{ .Values.node.healthPort }}
@@ -185,3 +191,6 @@ spec:
           hostPath:
             path: /etc/amazon/efs
             type: DirectoryOrCreate
+        {{- with .Values.node.volumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}

charts/aws-efs-csi-driver/values.yaml

@@ -89,6 +89,9 @@ controller:
     - key: efs.csi.aws.com/agent-not-ready
       operator: Exists
   affinity: {}
+  env: []
+  volumes: []
+  volumeMounts: []
   # Specifies whether a service account should be created
   serviceAccount:
     create: true
@@ -180,6 +183,9 @@ node:
     runAsUser: 0
     runAsGroup: 0
     fsGroup: 0
+  env: []
+  volumes: []
+  volumeMounts: []
 
 storageClasses: []
 # Add StorageClass resources like: