From 180d89ab6a2c62405a7739ccfb2ced44590c8c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czeraszkiewicz?=
 <extern.czeraszkiewicz_michal1@allianzdirect.de>
Date: Sat, 14 Aug 2021 08:29:19 +0200
Subject: [PATCH] feat: add support for env and envFrom

---
 .../templates/controller-deployment.yaml      | 24 ++++++++++++++++++-
 .../templates/node-daemonset.yaml             | 22 +++++++++++++++++
 charts/aws-efs-csi-driver/values.yaml         | 18 ++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
index 2aa11924f..e5697c8f1 100644
--- a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
+++ b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -23,7 +23,7 @@ spec:
       annotations: {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      hostNetwork: true 
+      hostNetwork: true
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- range .Values.imagePullSecrets }}
@@ -57,6 +57,13 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
+            {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -89,6 +96,13 @@ spec:
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
+            {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
@@ -101,6 +115,14 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --health-port=9909
+          {{- with .Values.env }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
diff --git a/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/aws-efs-csi-driver/templates/node-daemonset.yaml
index 3ad4202d6..9e7321a67 100644
--- a/charts/aws-efs-csi-driver/templates/node-daemonset.yaml
+++ b/charts/aws-efs-csi-driver/templates/node-daemonset.yaml
@@ -72,6 +72,13 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
+            {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet
@@ -115,6 +122,13 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- with .Values.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
@@ -130,6 +144,14 @@ spec:
             - --csi-address=/csi/csi.sock
             - --health-port=9809
             - --v={{ .Values.node.logLevel }}
+          {{- with .Values.env }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
index 67fd2b3c9..c7972f60f 100644
--- a/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/aws-efs-csi-driver/values.yaml
@@ -34,6 +34,24 @@ sidecars:
 
 imagePullSecrets: []
 
+env: []
+# Additional environment variables like:
+# - name: HTTPS_PROXY
+#   valueFrom:
+#     configMapKeyRef:
+#       name: proxy-config
+#       key: HTTPS_PROXY
+# - name: NO_PROXY
+#   valueFrom:
+#     configMapKeyRef:
+#       name: proxy-config
+#       key: NO_PROXY
+
+envFrom: []
+# Additional environment variables like:
+# - configMapRef:
+#     name: proxy-config
+
 ## Controller deployment variables
 
 controller: