added envs

Signed-off-by: Jens Gerke <[email protected]>
direktiv · Sep 22, 2023 · 51d8442 · 51d8442
1 parent b7a15f0
commit 51d8442
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/charts/direktiv/Chart.yaml b/charts/direktiv/Chart.yaml
@@ -16,13 +16,13 @@ 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.21-rc1
+version: 0.1.21-rc2
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.8.0-rc1"
+appVersion: "v0.8.0-rc2"
 
 dependencies:
   - name: prometheus

diff --git a/charts/direktiv/templates/frontend/frontend-config.yaml b/charts/direktiv/templates/frontend/frontend-config.yaml
@@ -24,3 +24,4 @@ data:
       backend: http://{{ include "direktiv.fullname" . }}-api.{{ .Release.Namespace }}:1644
       {{- end }}
       skipverify: {{ index .Values.frontend.backend "skip-verify" }}
+    {{ .Values.frontend.extraConfig }}
diff --git a/charts/direktiv/templates/frontend/frontend-deployment.yaml b/charts/direktiv/templates/frontend/frontend-deployment.yaml
@@ -55,6 +55,19 @@ spec:
           image: "{{ .Values.registry }}/{{ .Values.frontend.image }}:{{ .Values.frontend.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
           args: ["/etc/direktiv"]
+          env: 
+            {{- range $k, $v := .Values.frontend.additionalSecEnvs }}
+            - name: {{ $k }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $v.secret }}
+                  key: {{ $v.key }}
+            {{- end }}
+            - name: DIREKTIV_DB
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "direktiv.fullname" . }}
+                  key: db
           ports:
             - name: frontend
               containerPort: 2304

diff --git a/charts/direktiv/values.yaml b/charts/direktiv/values.yaml
@@ -229,12 +229,15 @@ frontend:
   additionalAnnotations: {}
   # -- Additional Labels for frontend
   additionalLabels: {}
+  # -- Additional secret environment variables
+  additionalSecEnvs: {}
   # -- Backend configuration for the workflow engine
   backend:
     # -- Defaults to engine in the same namespace
     url:
     # -- Skip verifing TLS certificate if TLS is configured
     skip-verify: false
+  extraConfig: 
   resources:
     requests:
       memory: "128Mi"