chore: cleanup env structure in deployment

zesty-co · Aug 8, 2024 · 06853de · 06853de
1 parent 72e432b
commit 06853de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ helm repo update
 ```
 $ helm search repo zesty
 NAME                    CHART VERSION   APP VERSION     DESCRIPTION
-zesty/zesty-k8s-helm    0.1.8           1.0.8           A Helm chart for Kubernetes
+zesty/zesty-k8s-helm    0.1.33          1.0.8           A Helm chart for Kubernetes
 ```
 3. Install the chart
 ```sh

diff --git a/charts/zesty/Chart.yaml b/charts/zesty/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.32
+version: 0.1.33
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/zesty/templates/deployment.yaml b/charts/zesty/templates/deployment.yaml
@@ -53,23 +53,18 @@ spec:
           envFrom:
             - configMapRef:
                 name: "{{ include "zesty-k8s.configmap" . }}"
-          {{- if ne .Values.encryptedCredentials ""}}
-          env:
-            - name: ENCRYPTED_CREDENTIALS
-              value: {{ .Values.encryptedCredentials | quote }}
-            {{- if .Values.awsCluster }}
-          envFrom:
+          {{- if .Values.awsCluster }}
             - secretRef:
                 name: "aws-cluster-secret"
-            {{- end }}
           {{- end }}
           {{- if eq .Values.encryptedCredentials "" }}
             - secretRef:
                 name: {{ .Values.secret.name | quote }}
-            {{- if .Values.awsCluster }}
-            - secretRef:
-                name: "aws-cluster-secret"
-            {{- end }}
+          {{- end }}
+          {{- if ne .Values.encryptedCredentials ""}}
+          env:
+            - name: ENCRYPTED_CREDENTIALS
+              value: {{ .Values.encryptedCredentials | quote }}
           {{- end }}
       priorityClassName: system-cluster-critical
       securityContext: