support for extra configMaps and Secrets

charts/sso/Chart.yaml

@@ -6,8 +6,8 @@ maintainers:
     email: [email protected]
     url: https://gunnar-scherf.de
 type: application
-version: 1.0.12
-appVersion: "3.3.33"
+version: 1.0.13
+appVersion: "3.3.34"
 icon: https://sso.g10f.de/apple-touch-icon.png
 dependencies:
   - name: memcached

charts/sso/templates/configmap.yaml

@@ -14,3 +14,17 @@ data:
   {{- if .Values.memcached.enabled }}
   CACHES_LOCATION: {{ .Release.Name }}-memcached:11211
   {{- end }}
+{{- $fullName := include "sso.fullname" . -}}
+{{- range $nameSuffix, $values := .Values.configMaps }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $fullName }}-{{ $nameSuffix }}
+  labels:
+    {{- include "sso.labels" $ | nindent 4 }}
+{{- with $values.data }}
+data:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end -}}

charts/sso/templates/job.yaml

@@ -23,6 +23,9 @@ spec:
                     name: {{ $.Release.Name }}-configmap
                 - secretRef:
                     name: {{ $.Release.Name }}-secret
+                {{- with $.Values.extraEnvFrom }}
+                {{- tpl . $ | nindent 16 }}
+                {{- end }}
               volumeMounts:
                 - mountPath: /opt/g10f/sso/htdocs/media
                   name: media

charts/sso/templates/secrets.yaml

@@ -13,3 +13,24 @@ stringData:
   {{- end }}
   RECAPTCHA_PRIVATE_KEY: {{ .Values.recaptchaPrivateKey | quote}}
   SSO_GOOGLE_GEO_API_KEY: {{ .Values.ssoGoogleGeoApiKey | quote}}
+{{- $fullName := include "sso.fullname" . -}}
+{{- range $nameSuffix, $values := .Values.secrets }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $fullName }}-{{ $nameSuffix }}
+  labels:
+    {{- include "sso.labels" $ | nindent 4 }}
+type: {{ default "Opaque" $values.type }}
+{{- with $values.data }}
+data:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- with $values.stringData }}
+stringData:
+  {{- range $key, $value := . }}
+  {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 2 }}
+  {{- end }}
+{{- end }}
+{{- end -}}

charts/sso/values.yaml

@@ -14,6 +14,9 @@ allowedHosts: ""
 siteName: "G10F"
 serverEmail: '"G10F SSO" <[email protected]>'
 secretKey: "changeme"
+recaptchaPrivateKey: ""
+ssoGoogleGeoApiKey: ""
+celeryBrokerURL: ""
 django:
   loadInitialData: "on"
   migrate: "on"
@@ -28,11 +31,20 @@ extraEnv: ""
 #  - name: EMAIL_PORT
 #    value: 587
 
-# Additional environment variables for sso mapped from Secret or ConfigMap
+# Configuration for secrets that should be created
+secrets: {}
+  # mysecret:
+  #   type: {}
+  #   stringData: {}
+  #   data: {}
+
+configMaps: {}
+  # myconfig:
+  #   data: {}
+
+# Additional environment variables for the wiki mapped from Secret or ConfigMap
 extraEnvFrom: ""
-recaptchaPrivateKey: ""
-ssoGoogleGeoApiKey: ""
-celeryBrokerURL: ""
+
 entryPoint: |
   {{- .Files.Get "scripts/docker-entrypoint.sh" }}