allow to use an existing secret for the user password

eniblock · Oct 13, 2023 · 1612008 · 1612008
1 parent b90c016
commit 1612008
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Tiltfile b/Tiltfile
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+secret_settings(disable_scrub=True)
 config.define_bool("no-volumes")
 cfg = config.parse()
 

diff --git a/cockroachdb/templates/job.init.yaml b/cockroachdb/templates/job.init.yaml
@@ -80,7 +80,7 @@ spec:
         {{- if and .Values.init.securityContext.enabled }}
           securityContext:
             allowPrivilegeEscalation: false
-            capabilities:  
+            capabilities:
               drop: ["ALL"]
         {{- end }}
           volumeMounts:
@@ -169,7 +169,7 @@ spec:
 
                       {{- range $user := .Values.init.provisioning.users }}
                         CREATE USER IF NOT EXISTS {{ $user.name }} WITH
-                        {{- if $user.password }}
+                        {{- if or $user.password $user.password_existing_secret}}
                           PASSWORD '${{ $user.name }}_PASSWORD'
                         {{- else }}
                           PASSWORD null
@@ -239,6 +239,12 @@ spec:
               secretKeyRef:
                 name: {{ $secretName }}
                 key: {{ $user.name }}-password
+        {{- else if $user.password_existing_secret }}
+          - name: {{ $user.name }}_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ tpl $user.password_existing_secret $ }}
+                key: {{ $user.password_existing_secret_key }}
         {{- end }}
         {{- end }}
         {{- range $clusterSetting, $clusterSettingValue := .Values.init.provisioning.clusterSettings }}
@@ -261,7 +267,7 @@ spec:
         {{- if and .Values.init.securityContext.enabled }}
           securityContext:
             allowPrivilegeEscalation: false
-            capabilities:  
+            capabilities:
               drop: ["ALL"]
         {{- end }}
     {{- if .Values.tls.enabled }}