From beb7a5c6f82487e77f413c7ca537a6a5e1de68e6 Mon Sep 17 00:00:00 2001
From: Lindsay Codecademy <lindsay@codecademy.com>
Date: Mon, 1 Aug 2022 13:50:49 -0400
Subject: [PATCH 1/2] env from secret

Signed-off-by: Lindsay Codecademy <lindsay@codecademy.com>
---
 charts/service/Chart.yaml                | 2 +-
 charts/service/templates/deployment.yaml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/charts/service/Chart.yaml b/charts/service/Chart.yaml
index e7b0fab..ed31024 100644
--- a/charts/service/Chart.yaml
+++ b/charts/service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: service
 description: A generic k8s service chart
 type: application
-version: 1.0.20
+version: 1.0.21
 maintainers:
   - email: devops@codecademy.com
     name: devops
diff --git a/charts/service/templates/deployment.yaml b/charts/service/templates/deployment.yaml
index e2a80d9..c6e183f 100644
--- a/charts/service/templates/deployment.yaml
+++ b/charts/service/templates/deployment.yaml
@@ -57,6 +57,10 @@ spec:
           command:
 {{ toYaml .Values.image.command | indent 12 }}
           {{- end }}
+          {{- if .Values.envFromSecret }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.envFromSecret }}
           env:
           {{- range $key, $value := .Values.envKeyValue }}
             - name: {{ $key }}

From 57decba5556f382d607b9d05e9842f79baa6f21c Mon Sep 17 00:00:00 2001
From: Lindsay Codecademy <lindsay@codecademy.com>
Date: Mon, 1 Aug 2022 13:55:22 -0400
Subject: [PATCH 2/2] syntax

Signed-off-by: Lindsay Codecademy <lindsay@codecademy.com>
---
 charts/service/templates/deployment.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/charts/service/templates/deployment.yaml b/charts/service/templates/deployment.yaml
index c6e183f..bc6bf78 100644
--- a/charts/service/templates/deployment.yaml
+++ b/charts/service/templates/deployment.yaml
@@ -61,6 +61,7 @@ spec:
           envFrom:
             - secretRef:
                 name: {{ .Values.envFromSecret }}
+          {{- end }}
           env:
           {{- range $key, $value := .Values.envKeyValue }}
             - name: {{ $key }}