From aafc0bbfabe9dbd289cbe4436648b3a00e7d5e2b Mon Sep 17 00:00:00 2001
From: Youcef Guichi <youcef@gimlet.io>
Date: Fri, 20 Oct 2023 10:36:50 +0200
Subject: [PATCH] Removed envfrom -- Updated unittest

---
 charts/common/templates/_envFromRef.yaml      |   9 +++------
 charts/cron-job/charts/common-0.3.1.tgz       | Bin 2150 -> 2140 bytes
 charts/onechart/charts/common-0.3.1.tgz       | Bin 2150 -> 2138 bytes
 charts/onechart/templates/deployment.yaml     |   2 +-
 .../tests/deployment_configmap_test.yaml      |  16 ++++++++++------
 .../tests/deployment_secret_test.yaml         |  11 +++++------
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/charts/common/templates/_envFromRef.yaml b/charts/common/templates/_envFromRef.yaml
index d7cc7cf..d3c6c86 100644
--- a/charts/common/templates/_envFromRef.yaml
+++ b/charts/common/templates/_envFromRef.yaml
@@ -1,24 +1,21 @@
 {{- define "common.envFromRef.tpl" -}}
-{{- if or (or (or (.Values.vars) (.Values.secretEnabled) (.Values.envFrom)) .Values.sealedSecrets) .Values.secretName -}}
+{{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets -}}
 envFrom: &envFrom
 {{- if .Values.vars }}
   - configMapRef:
       name: {{ template "common.robustName" .Release.Name }}
 {{- end }}
-{{- if .Values.envFrom }}
-
-{{- range .Values.envFrom.existingSecrets }}
+{{- range .Values.existingSecrets }}
   - secretRef:
       name: {{ .name }}
       optional: {{ .optional }}
 {{- end }}
 
-{{- range .Values.envFrom.existingConfigMaps }}
+{{- range .Values.existingConfigMaps }}
   - configMapRef:
       name: {{ .name }}
       optional: {{ .optional }}
 {{- end }}
-{{- end }}
 
 {{- if .Values.secretEnabled }}
   - secretRef:
diff --git a/charts/cron-job/charts/common-0.3.1.tgz b/charts/cron-job/charts/common-0.3.1.tgz
index 854f9c0b433aef98df37246cc574e01a354548f5..11a7ba4ff9f9de84530926ec166316adce91ffcf 100644
GIT binary patch
delta 2103
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

delta 2113
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

diff --git a/charts/onechart/charts/common-0.3.1.tgz b/charts/onechart/charts/common-0.3.1.tgz
index 264c4c041ba8f20110145cd9232b48234b63f183..502b2c64f72c8e55478c071ef073bb1f03c58850 100644
GIT binary patch
delta 2060
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

delta 2053
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

diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml
index a733250..e9b1ae0 100644
--- a/charts/onechart/templates/deployment.yaml
+++ b/charts/onechart/templates/deployment.yaml
@@ -138,7 +138,7 @@ spec:
             - -c
             - {{ .Values.sidecar.command | quote }}
           {{- end }}
-          {{- if or (or (.Values.vars) (.Values.secretEnabled) (.Values.envFrom)) .Values.sealedSecrets }}
+          {{- if or (or (or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName) .Values.existingConfigMaps) .Values.existingSecrets }}
           envFrom: *envFrom
           {{- end }}
           {{- if or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets }}
diff --git a/charts/onechart/tests/deployment_configmap_test.yaml b/charts/onechart/tests/deployment_configmap_test.yaml
index 8c29ccc..dbb869b 100644
--- a/charts/onechart/tests/deployment_configmap_test.yaml
+++ b/charts/onechart/tests/deployment_configmap_test.yaml
@@ -14,14 +14,18 @@ tests:
           content:
             configMapRef:
               name: release-name
+  - it: Should not reference configmap if vars are not set
+    asserts:
+     - isNull:
+         path: spec.template.spec.containers[0].envFrom
+
   - it: Should reference to existing configmaps
     set:
-      envFrom:
-        existingConfigMaps:
-        - name: firstcm
-          optional: true
-        - name: secondcm
-          optional: true
+      existingConfigMaps:
+      - name: firstcm
+        optional: true
+      - name: secondcm
+        optional: true
     asserts:
       - contains:
           path: spec.template.spec.containers[0].envFrom
diff --git a/charts/onechart/tests/deployment_secret_test.yaml b/charts/onechart/tests/deployment_secret_test.yaml
index 4414e3a..64d3ef2 100644
--- a/charts/onechart/tests/deployment_secret_test.yaml
+++ b/charts/onechart/tests/deployment_secret_test.yaml
@@ -33,12 +33,11 @@ tests:
               name: release-name
   - it: Should reference to existing secrets
     set:
-      envFrom:
-        existingSecrets:
-        - name: firstsecret
-          optional: true
-        - name: secondsecret
-          optional: true
+      existingSecrets:
+      - name: firstsecret
+        optional: true
+      - name: secondsecret
+        optional: true
     asserts:
       - contains:
           path: spec.template.spec.containers[0].envFrom