From 0fcb65e79018e01e8bb9b6b3ea0599cd4a2b7770 Mon Sep 17 00:00:00 2001
From: jbdelpech <33421771+jbdelpech@users.noreply.github.com>
Date: Fri, 19 Jun 2020 10:23:58 +0200
Subject: [PATCH] [stable/efs-provisioner] Add extra env variables and envFrom
 support (#22845)

Signed-off-by: Jean-Baptiste Delpech <jb.delpech@gmail.com>
---
 stable/efs-provisioner/Chart.yaml                | 2 +-
 stable/efs-provisioner/README.md                 | 5 +++++
 stable/efs-provisioner/templates/deployment.yaml | 7 +++++++
 stable/efs-provisioner/values.yaml               | 5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/stable/efs-provisioner/Chart.yaml b/stable/efs-provisioner/Chart.yaml
index ba0ff7ad8e..142c015a51 100644
--- a/stable/efs-provisioner/Chart.yaml
+++ b/stable/efs-provisioner/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: efs-provisioner
 description: A Helm chart for the AWS EFS external storage provisioner
-version: 0.11.1
+version: 0.12.0
 appVersion: v2.4.0
 home: https://github.com/kubernetes-incubator/external-storage/tree/master/aws/efs
 sources:
diff --git a/stable/efs-provisioner/README.md b/stable/efs-provisioner/README.md
index 9ef0dbf104..73b1999bd2 100644
--- a/stable/efs-provisioner/README.md
+++ b/stable/efs-provisioner/README.md
@@ -75,6 +75,11 @@ busyboxImage:
 ##
 annotations: {}
 
+## Extra env variables and envFrom
+extraEnv: []
+
+envFrom: []
+
 ## Configure provisioner
 ## https://github.com/kubernetes-incubator/external-storage/tree/master/aws/efs#deployment
 ##
diff --git a/stable/efs-provisioner/templates/deployment.yaml b/stable/efs-provisioner/templates/deployment.yaml
index adbe3af2e0..6d1bb5ee82 100644
--- a/stable/efs-provisioner/templates/deployment.yaml
+++ b/stable/efs-provisioner/templates/deployment.yaml
@@ -68,6 +68,13 @@ spec:
         - name: DNS_NAME
           value: {{ .Values.efsProvisioner.dnsName }}
         {{- end }}
+        {{- if .Values.extraEnv }}
+        {{ toYaml .Values.extraEnv | nindent 8 }}
+        {{- end }}
+        {{- if .Values.envFrom }}
+        envFrom:
+        {{ toYaml .Values.envFrom | nindent 8 }}
+        {{- end }}
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         volumeMounts:
diff --git a/stable/efs-provisioner/values.yaml b/stable/efs-provisioner/values.yaml
index 887c9050d4..8fd46fbafb 100644
--- a/stable/efs-provisioner/values.yaml
+++ b/stable/efs-provisioner/values.yaml
@@ -25,6 +25,11 @@ busyboxImage:
   tag: 1.27
   pullPolicy: IfNotPresent
 
+## Extra env variables and envFrom
+extraEnv: []
+
+envFrom: []
+
 ## Deployment annotations
 ##
 annotations: {}