Merge pull request #51 from brunobriante/main

Add option to customize databaseUrlSecretName key
windmill-labs · Jan 2, 2024 · a632f1f · a632f1f
2 parents 646097c + 5b718bc
commit a632f1f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/charts/windmill/README.md.gotmpl b/charts/windmill/README.md.gotmpl
@@ -19,7 +19,7 @@
 
 If you would prefer to keep the PostgreSQL password or connection string out of the Helm values, there are two different possible approaches:
 
-1. Use `windmill.databaseUrlSecretName` to point at a Secret with a `url` key containing the entire database connection string.
+1. Use `windmill.databaseUrlSecretName` to point at a Secret with a `url` key or another key set with `windmill.databaseUrlSecretKey` that contains the entire database connection string.
 
 2. Use `windmill.databaseUrl` with [Dependent Environment Variables](https://kubernetes.io/docs/tasks/inject-data-application/define-interdependent-environment-variables/) together with `windmill.app.extraEnv` and `windmill.workers.extraEnv`.
 

diff --git a/charts/windmill/templates/app.yaml b/charts/windmill/templates/app.yaml
@@ -10,7 +10,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.windmill.appReplicas }}
-  strategy: 
+  strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 3
@@ -76,7 +76,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: "{{ .Values.windmill.databaseUrlSecretName }}"
-              key: url
+              key: "{{ .Values.windmill.databaseUrlSecretKey }}"
         {{ else }}
         - name: "DATABASE_URL"
           value: "{{ .Values.windmill.databaseUrl }}"

diff --git a/charts/windmill/templates/worker-groups.yaml b/charts/windmill/templates/worker-groups.yaml
@@ -14,7 +14,7 @@ metadata:
     workerGroup: {{ $v.name }}
 spec:
   replicas: {{ $v.replicas }}
-  strategy: 
+  strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 3
@@ -77,7 +77,7 @@ spec:
           valueFrom:
             secretKeyRef:
               name: "{{ $.Values.windmill.databaseUrlSecretName }}"
-              key: url
+              key: "{{ $.Values.windmill.databaseUrlSecretKey }}"
         {{ else }}
         - name: "DATABASE_URL"
           value: "{{ $.Values.windmill.databaseUrl }}"
@@ -153,6 +153,6 @@ spec:
     {{- with $v.tolerations }}
       tolerations:
 {{ toYaml . | indent 8 }}
-{{- end }}    
+{{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/windmill/values.yaml b/charts/windmill/values.yaml
@@ -38,8 +38,10 @@ windmill:
   lspReplicas: 2
   # -- replicas for the lsp containers used by the app
   multiplayerReplicas: 1
-  # -- name of the secret storing the database URI, take precedence over databaseUrl. The key of the url is 'url'
+  # -- name of the secret storing the database URI, take precedence over databaseUrl.
   databaseUrlSecretName: ""
+  # -- name of the key in secret storing the database URI. The default key of the url is 'url'
+  databaseUrlSecretKey: url
   # -- Postgres URI, pods will crashloop if database is unreachable, sets DATABASE_URL environment variable in app and worker container
   databaseUrl: postgres://postgres:windmill@windmill-postgresql/windmill?sslmode=disable
   # -- domain as shown in browser, this variable and `baseProtocol` are used as part of the BASE_URL environment variable in app and worker container and in the ingress resource, if enabled