Merge pull request #36 from T-Systems-MMS/env_from_secret

habr-mms · web-flow · commit e237fa12dccd · 2022-08-05T10:56:07.000+02:00
Feature: Env vars from k8s secrets
diff --git a/typo3/Chart.yaml b/typo3/Chart.yaml
@@ -2,4 +2,4 @@
 apiVersion: v1
 name: typo3
 description: Typo3 Configuration
-version: 0.2.0
+version: 0.3.0
diff --git a/typo3/templates/deployment.yaml b/typo3/templates/deployment.yaml
@@ -66,6 +66,13 @@ spec:
         - name: {{ $name }}
           value: {{ $value | quote }}
         {{- end }}
+        {{- range $secretEnv := .Values.deployment.containers.secretEnv }}
+        - name: {{ $secretEnv.name }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ $secretEnv.secretKeyRef.name }}
+              key: {{ $secretEnv.secretKeyRef.key }}
+        {{- end }}
       volumes:
       - name: typo3-content
         persistentVolumeClaim:
diff --git a/wordpress/Chart.yaml b/wordpress/Chart.yaml
@@ -2,4 +2,4 @@
 apiVersion: v1
 name: wordpress
 description: WordPress Configuration
-version: 0.2.0
+version: 0.3.0
diff --git a/wordpress/templates/deployment.yaml b/wordpress/templates/deployment.yaml
@@ -60,6 +60,13 @@ spec:
         - name: {{ $name }}
           value: {{ $value | quote }}
         {{- end }}
+        {{- range $secretEnv := .Values.deployment.containers.secretEnv }}
+        - name: {{ $secretEnv.name }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ $secretEnv.secretKeyRef.name }}
+              key: {{ $secretEnv.secretKeyRef.key }}
+        {{- end }}
       volumes:
       - name: wordpress-content
         persistentVolumeClaim:
