Merge pull request #35 from gab-nando/main

Add escape hatch for extra manifests + support for env vars from secrets

Author: anna-yn

Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 4.6.1
+version: 4.7.0
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com

templates/deployment_backend.yaml

@@ -132,6 +132,13 @@ spec:
           - name: "{{ $key }}"
             value: "{{ $value }}"
           {{- end }}
+          {{- range .Values.environmentSecrets }}
+          - name: {{ .name }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ .secretKeyRef.name }}
+                key: {{ .secretKeyRef.key }}
+          {{- end }}
         {{- if .Values.externalSecrets.enabled }}
         envFrom:
         - secretRef:

templates/deployment_jobs.yaml

@@ -133,6 +133,13 @@ spec:
           - name: "{{ $key }}"
             value: "{{ $value }}"
           {{- end }}
+          {{- range .Values.environmentSecrets }}
+          - name: {{ .name }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ .secretKeyRef.name }}
+                key: {{ .secretKeyRef.key }}
+          {{- end }}
         {{- if .Values.externalSecrets.enabled }}
         envFrom:
         - secretRef:

templates/extra-manifests.yaml

@@ -0,0 +1,4 @@
+{{- range .Values.extraManifests }}
+---
+{{ tpl (toYaml .) $ }}
+{{- end }}

values.yaml

@@ -51,6 +51,18 @@ commandline:
 
 env: {}
 
+# Optionally specify additional environment variables to be populated from Kubernetes secrets.
+# Useful for passing in SCIM_AUTH_TOKEN or other secret environment variables from Kubernetes secrets.
+environmentSecrets: []
+  # - name: SCIM_AUTH_TOKEN
+  #   secretKeyRef:
+  #     name: retool-scim-auth-token
+  #     key: auth-token
+  # - name: GITHUB_APP_PRIVATE_KEY
+  #   secretKeyRef:
+  #     name: retool-github-app-private-key
+  #     key: private-key
+
 # Support for external secrets https://github.com/godaddy/kubernetes-external-secrets
 externalSecrets:
   enabled: false
@@ -213,3 +225,13 @@ securityContext:
 extraConfigMapMounts: []
 
 initContainers: {}
+
+extraManifests: []
+# extraManifests:
+#  - apiVersion: cloud.google.com/v1beta1
+#    kind: BackendConfig
+#    metadata:
+#      name: "{{ .Release.Name }}-testing"
+#    spec:
+#      securityPolicy:
+#        name: "my-gcp-cloud-armor-policy"