Merge pull request #213 from memphisdev/latest

Latest
superstreamlabs · Jan 3, 2024 · e1689bb · e1689bb
2 parents 1dec5ad + 761a750
commit e1689bb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/memphis/templates/NOTES.txt b/memphis/templates/NOTES.txt
@@ -1,12 +1,11 @@
-
-  __  __                      _     _     
+ __  __                      _     _     
 |  \/  | ___ _ __ ___  _ __ | |__ (_)___ 
 | |\/| |/ _ \ '_ ` _ \| '_ \| '_ \| / __|
 | |  | |  __/ | | | | | |_) | | | | \__ \
 |_|  |_|\___|_| |_| |_| .__/|_| |_|_|___/
                       |_|                
 
-Melvis thank you for installing {{ .Chart.Name }}!
+Thank you for installing {{ .Chart.Name }}!
 A dev first event-processing platform.
 
 ---------------------------------------------------------------------------------------------------------------------------------------------
@@ -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
@@ -279,6 +279,10 @@ spec:
               key: {{ .key }}
         {{- end }}
         {{- end }}
+        {{- with .Values.websocket }}
+        - name: WS_HOST
+          value: {{ .host }}:{{ .port }}
+        {{- end }}
         - name: USER_PASS_BASED_AUTH
           value: {{ .Values.memphis.configFile.userPassBasedAuth | quote }}
         - name: LOGS_RETENTION_IN_DAYS
@@ -344,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
@@ -480,13 +480,11 @@ auth:
 websocket:
   enabled: true
   port: 7770
+  # Websocket URL configuration.
+  host: localhost
   noTLS: true
   sameOrigin: false
   allowedOrigins: []
-  #auth:
-  #  token: memphis
-  #  user: ""
-  #  pass: ""
 appProtocol:
   enabled: false
 
@@ -520,6 +518,7 @@ metadata:
     initdbScripts:
       init.sql: |
         CREATE DATABASE memphis;
+    existingSecret: ""
   fullnameOverride: memphis-metadata
   pgpool:
     image:
@@ -530,6 +529,7 @@ metadata:
       certFilename: ""
       certKeyFilename: ""
       certCAFilename: ""
+    existingSecret: ""
   external:
     enabled: false
     dbTlsMutual: true

diff --git a/version.conf b/version.conf
@@ -1 +1 @@
-1.4.0
+1.4.1