From ae6c2191321606fff54d27b41fa27c38c10223b9 Mon Sep 17 00:00:00 2001
From: Laszlo Fogas <laszlo@laszlo.cloud>
Date: Mon, 2 Aug 2021 08:46:16 +0200
Subject: [PATCH] Supporting secretName without secretEnabled

---
 charts/onechart/templates/deployment.yaml         | 8 ++++++--
 charts/onechart/tests/deployment_secret_test.yaml | 9 +--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml
index 5255f37..6ca51e3 100644
--- a/charts/onechart/templates/deployment.yaml
+++ b/charts/onechart/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
             - -c
             - {{ .Values.command | quote }}
           {{- end }}
-          {{- if or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets }}
+          {{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName }}
           envFrom: &envFrom
             {{- if .Values.vars }}
             - configMapRef:
@@ -69,7 +69,11 @@ spec:
             {{- end }}
             {{- if .Values.secretEnabled }}
             - secretRef:
-                name: {{ .Values.secretName | default (include "robustName" $.Release.Name) }}
+                name: {{ include "robustName" $.Release.Name }}
+            {{- end }}
+            {{- if .Values.secretName }}
+            - secretRef:
+                name: {{ .Values.secretName }}
             {{- end }}
             {{- if .Values.sealedSecrets }}
             - secretRef:
diff --git a/charts/onechart/tests/deployment_secret_test.yaml b/charts/onechart/tests/deployment_secret_test.yaml
index b4256fe..5dfc580 100644
--- a/charts/onechart/tests/deployment_secret_test.yaml
+++ b/charts/onechart/tests/deployment_secret_test.yaml
@@ -12,15 +12,8 @@ tests:
           content:
             secretRef:
               name: release-name
-  - it: Should not reference secret if secret is disabled
+  - it: Should reference secret by name
     set:
-      secretEnabled: false
-    asserts:
-      - isNull:
-          path: spec.template.spec.containers[0].envFrom
-  - it: Should not reference secret if secret is disabled
-    set:
-      secretEnabled: true
       secretName: my-custom-secret
     asserts:
       - contains: