Merge pull request #210 from memphisdev/metadata

Metadata
superstreamlabs · Dec 27, 2023 · 1957fa6 · 1957fa6
2 parents 953a3e1 + 8a25ce4
commit 1957fa6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/memphis/templates/NOTES.txt b/memphis/templates/NOTES.txt
@@ -1,4 +1,3 @@
-
  __  __                      _     _     
 |  \/  | ___ _ __ ___  _ __ | |__ (_)___ 
 | |\/| |/ _ \ '_ ` _ \| '_ \| '_ \| / __|
@@ -34,9 +33,9 @@ Deployment Information
 -------------------------
 ## Secrets ##
 UI/CLI/SDK root username        - root
-UI/CLI root Password            - kubectl get secret memphis-creds -n {{ .Release.Namespace }} -o jsonpath="{.data.ROOT_PASSWORD}" | base64 --decode
+UI/CLI     root Password        - kubectl get secret {{ .Values.memphis.creds.secretConfig.name }} -n {{ .Release.Namespace }} -o jsonpath="{.data.ROOT_PASSWORD}" | base64 --decode
 {{- if eq .Values.user_pass_based_auth false }}
-SDK root connection token       - kubectl get secret memphis-creds -n {{ .Release.Namespace }} -o jsonpath="{.data.CONNECTION_TOKEN}" | base64 --decode
+SDK root connection token       - kubectl get secret {{ .Values.memphis.creds.secretConfig.name }} -n {{ .Release.Namespace }} -o jsonpath="{.data.CONNECTION_TOKEN}" | base64 --decode
 {{- end }}
 
 

diff --git a/memphis/templates/memphis_statefulset.yaml b/memphis/templates/memphis_statefulset.yaml
@@ -348,7 +348,7 @@ spec:
         - name: METADATA_DB_PASS
           valueFrom:
               secretKeyRef:
-                name: "memphis-metadata"
+                name: {{ if .Values.metadata.postgresql.existingSecret }}{{ .Values.metadata.postgresql.existingSecret | quote }}{{ else }}{{ "memphis-metadata" }}{{ end }}
                 key: password
         - name: METADATA_DB_DBNAME
           value: "memphis"

diff --git a/memphis/values.yaml b/memphis/values.yaml
@@ -518,6 +518,7 @@ metadata:
     initdbScripts:
       init.sql: |
         CREATE DATABASE memphis;
+    existingSecret: ""
   fullnameOverride: memphis-metadata
   pgpool:
     image:
@@ -528,6 +529,7 @@ metadata:
       certFilename: ""
       certKeyFilename: ""
       certCAFilename: ""
+    existingSecret: ""
   external:
     enabled: false
     dbTlsMutual: true