Merge pull request #17 from 4censord/feat/extraEnv

feat: allow specifying env vars populated from secrets

Author: Techwolf12

pretix-helm/templates/pretix-cron.yaml

@@ -35,4 +35,6 @@ spec:
               - name: {{ $key }}
                 value: {{ $value | quote }}
               {{- end }}
-            
+              {{if .Values.extraEnv }}
+              {{ .Values.extraEnv | toYaml | nindent 8}}
+              {{- end}}

pretix-helm/templates/pretix-migrate.yaml

@@ -32,7 +32,10 @@ spec:
         - name: pretix-data
           mountPath: /data
         env:
-            {{- range $key, $value := .Values.env }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
-            {{- end }}
+          {{- range $key, $value := .Values.env }}
+          - name: {{ $key }}
+            value: {{ $value | quote }}
+          {{- end }}
+          {{if .Values.extraEnv }}
+          {{ .Values.extraEnv | toYaml | nindent 8}}
+          {{- end}}

pretix-helm/templates/pretix-web-deployment.yaml

@@ -37,6 +37,9 @@ spec:
         - name: {{ $key }}
           value: {{ $value | quote }}
         {{- end }}
+        {{if .Values.extraEnv }}
+        {{ .Values.extraEnv | toYaml | nindent 8}}
+        {{- end}}
         resources:
           requests:
             memory: "{{ .Values.resources.requests.memory }}"

pretix-helm/templates/pretix-worker-deployment.yaml

@@ -37,6 +37,9 @@ spec:
         - name: {{ $key }}
           value: {{ $value | quote }}
         {{- end }}
+        {{if .Values.extraEnv }}
+        {{ .Values.extraEnv | toYaml | nindent 8}}
+        {{- end}}
         resources:
           requests:
             memory: "{{ .Values.resources.requests.memory }}"

pretix-helm/values.yaml

@@ -35,6 +35,14 @@ env:
   PRETIX_CELERY_BACKEND: redis://pretix-redis-master/1
   PRETIX_CELERY_BROKER: redis://pretix-redis-master/2
 
+# For setting custom env vars, populated from secrets
+extraEnv: []
+  # - name: PRETIX_DATABASE_NAME
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: db_secret
+  #       key: dbname
+
 labels: []
 
 # Resource limits and requests