Merge pull request #3570 from meerkampdvv/master

Helm: Made SecretEnv a secret and added default mongodb name as Wekan

helm/wekan/Chart.yaml

@@ -1,5 +1,5 @@
 name: wekan
-version: 1.0.2
+version: 1.0.3
 apiVersion: v1
 description: Open Source kanban
 home: https://wekan.github.io/

helm/wekan/templates/_helpers.tpl

@@ -81,7 +81,7 @@ else use user-provided URL.
 {{- $release := .Release.Name -}}
 {{- $replicaSetName := (index .Values "mongodb" "replicaSetName") -}}
 {{- $mongodbSvcName := include "wekan.mongodb.svcname" . -}}
-mongodb://{{- range $v := until $count }}{{ $release }}-mongodb-{{ $v }}.{{ $mongodbSvcName }}:27017{{ if ne $v (sub $count 1) }},{{- end -}}{{- end -}}?replicaSet={{ $replicaSetName }}
+mongodb://{{- range $v := until $count }}{{ $release }}-mongodb-{{ $v }}.{{ $mongodbSvcName }}:27017{{ if ne $v (sub $count 1) }},{{- end -}}{{- end -}}/{{ .Values.dbname }}?replicaSet={{ $replicaSetName }}
 {{- else -}}
 {{- index .Values "mongodb" "url" -}}
 {{- end -}}

helm/wekan/templates/deployment.yaml

@@ -46,7 +46,10 @@ spec:
           {{- range $key := .Values.secretEnv }}
           {{- if .value }}
             - name: {{ .name }}
-              value: {{ .value | quote }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "wekan.fullname" $ }}-secret
+                  key: {{ .name }}
           {{- end }}
           {{- end }}
           livenessProbe:

helm/wekan/templates/secret.yaml

@@ -0,0 +1,11 @@
+{{ if .Values.secretEnv }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "wekan.fullname" $ }}-secret
+type: Opaque
+data:
+  {{- range $key := .Values.secretEnv }}
+  {{ $key.name }}: {{ $key.value | b64enc }}
+  {{- end}}
+{{ end }}

helm/wekan/values.yaml

@@ -21,6 +21,7 @@ image:
 ##
 
 replicaCount: 1
+dbname: wekan
 
 ## Specify additional environmental variables for the Deployment
 ##
@@ -32,9 +33,9 @@ env:
 ## Deployment. These can e.g. be provided by a Secret and allow
 ## to store passwords separately
 ##
-secretEnv:
-  - name: ""
-    value: ""
+secretEnv: {}
+  # - name: ""
+  #   value: ""
 
 service:
   type: NodePort