From 2269709750f17e3c5242975ba791c3304c3f6394 Mon Sep 17 00:00:00 2001 From: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com> Date: Wed, 20 Dec 2023 19:09:47 +0200 Subject: [PATCH 1/8] Update NOTES.txt --- memphis/templates/NOTES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/memphis/templates/NOTES.txt b/memphis/templates/NOTES.txt index afe0728..a3b8e98 100644 --- a/memphis/templates/NOTES.txt +++ b/memphis/templates/NOTES.txt @@ -1,12 +1,12 @@ - __ __ _ _ + __ __ _ _ | \/ | ___ _ __ ___ _ __ | |__ (_)___ | |\/| |/ _ \ '_ ` _ \| '_ \| '_ \| / __| | | | | __/ | | | | | |_) | | | | \__ \ |_| |_|\___|_| |_| |_| .__/|_| |_|_|___/ |_| -Melvis thank you for installing {{ .Chart.Name }}! +Thank you for installing {{ .Chart.Name }}! A dev first event-processing platform. --------------------------------------------------------------------------------------------------------------------------------------------- From 87c3bcf45a7c32d4de9587a06c2524dd78a43fb0 Mon Sep 17 00:00:00 2001 From: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com> Date: Mon, 25 Dec 2023 14:39:22 +0200 Subject: [PATCH 2/8] Update values.yaml --- memphis/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/memphis/values.yaml b/memphis/values.yaml index bc54e97..39f0ef1 100644 --- a/memphis/values.yaml +++ b/memphis/values.yaml @@ -480,6 +480,8 @@ auth: websocket: enabled: true port: 7770 + # host: memphis.example.com + host: staging.memphis-gcp.dev noTLS: true sameOrigin: false allowedOrigins: [] From 17c63413207158a15dfbcb91b1765fbb0878389f Mon Sep 17 00:00:00 2001 From: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com> Date: Mon, 25 Dec 2023 14:43:19 +0200 Subject: [PATCH 3/8] Update memphis_statefulset.yaml --- memphis/templates/memphis_statefulset.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/memphis/templates/memphis_statefulset.yaml b/memphis/templates/memphis_statefulset.yaml index 453496d..56da19d 100644 --- a/memphis/templates/memphis_statefulset.yaml +++ b/memphis/templates/memphis_statefulset.yaml @@ -279,6 +279,12 @@ spec: key: {{ .key }} {{- end }} {{- end }} + {{- with .Values.websocket }} + {{- with .host }} + - name: WS_HOST + value: {{ .Values.websocket.host }}:{{ .Values.websocket.port }} + {{- end }} + {{- end }} - name: USER_PASS_BASED_AUTH value: {{ .Values.memphis.configFile.userPassBasedAuth | quote }} - name: LOGS_RETENTION_IN_DAYS From b6c791d06cd2a8a4ec384573fabe2dde3a2bb536 Mon Sep 17 00:00:00 2001 From: valeraBr Date: Mon, 25 Dec 2023 15:22:38 +0200 Subject: [PATCH 4/8] ws config --- memphis/templates/memphis_statefulset.yaml | 4 +--- memphis/values.yaml | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/memphis/templates/memphis_statefulset.yaml b/memphis/templates/memphis_statefulset.yaml index 56da19d..2bff2ac 100644 --- a/memphis/templates/memphis_statefulset.yaml +++ b/memphis/templates/memphis_statefulset.yaml @@ -280,10 +280,8 @@ spec: {{- end }} {{- end }} {{- with .Values.websocket }} - {{- with .host }} - name: WS_HOST - value: {{ .Values.websocket.host }}:{{ .Values.websocket.port }} - {{- end }} + value: {{ .host }}:{{ .port }} {{- end }} - name: USER_PASS_BASED_AUTH value: {{ .Values.memphis.configFile.userPassBasedAuth | quote }} diff --git a/memphis/values.yaml b/memphis/values.yaml index 39f0ef1..7c7f40b 100644 --- a/memphis/values.yaml +++ b/memphis/values.yaml @@ -485,10 +485,6 @@ websocket: noTLS: true sameOrigin: false allowedOrigins: [] - #auth: - # token: memphis - # user: "" - # pass: "" appProtocol: enabled: false From a41748947bbeadaa5f3697b103674666637420ce Mon Sep 17 00:00:00 2001 From: valeraBr Date: Mon, 25 Dec 2023 15:44:31 +0200 Subject: [PATCH 5/8] ws fix --- memphis/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/memphis/values.yaml b/memphis/values.yaml index 7c7f40b..b2d5421 100644 --- a/memphis/values.yaml +++ b/memphis/values.yaml @@ -480,8 +480,8 @@ auth: websocket: enabled: true port: 7770 - # host: memphis.example.com - host: staging.memphis-gcp.dev + # Websocket URL configuration. + host: localhost noTLS: true sameOrigin: false allowedOrigins: [] From f65f133fcfc73a50eed0ca2c825fe98aa0f17918 Mon Sep 17 00:00:00 2001 From: valeraBr Date: Tue, 26 Dec 2023 22:49:35 +0200 Subject: [PATCH 6/8] metadata+notes fix --- memphis/templates/NOTES.txt | 5 ++--- memphis/templates/memphis_statefulset.yaml | 3 ++- memphis/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/memphis/templates/NOTES.txt b/memphis/templates/NOTES.txt index a3b8e98..92740e8 100644 --- 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 index 2bff2ac..2147158 100644 --- a/memphis/templates/memphis_statefulset.yaml +++ b/memphis/templates/memphis_statefulset.yaml @@ -348,7 +348,8 @@ spec: - name: METADATA_DB_PASS valueFrom: secretKeyRef: - name: "memphis-metadata" + #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 index b2d5421..d8d8373 100644 --- 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 From 8a25ce4e2ce69268e2d24df8fb33ad023adacbb0 Mon Sep 17 00:00:00 2001 From: valeraBr Date: Wed, 27 Dec 2023 07:47:17 +0200 Subject: [PATCH 7/8] remove comment --- memphis/templates/memphis_statefulset.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/memphis/templates/memphis_statefulset.yaml b/memphis/templates/memphis_statefulset.yaml index 2147158..bcfc4cc 100644 --- a/memphis/templates/memphis_statefulset.yaml +++ b/memphis/templates/memphis_statefulset.yaml @@ -348,7 +348,6 @@ 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 From 0ae8c0a657e9aedb996e3f60d460bb0b8ad03ce3 Mon Sep 17 00:00:00 2001 From: Beka Kotchauri Date: Wed, 3 Jan 2024 20:16:24 +0400 Subject: [PATCH 8/8] change version --- version.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.conf b/version.conf index e21e727..13175fd 100644 --- a/version.conf +++ b/version.conf @@ -1 +1 @@ -1.4.0 \ No newline at end of file +1.4.1 \ No newline at end of file