From fc5bed1ba563f52fcf116ec658d91b76949d631a Mon Sep 17 00:00:00 2001 From: Eric Shen Date: Fri, 20 Dec 2024 22:29:25 +0800 Subject: [PATCH] fix: console kop service port issue (#1194) Signed-off-by: ericsyh (cherry picked from commit b293669da4abdaaae357a0bbfd4584c37c44580e) --- .../streamnative-console-statefulset.yaml | 6 +++++- .../streamnative-console-statefulset.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml index 229dd280..0a143c6f 100644 --- a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml +++ b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml @@ -136,7 +136,11 @@ spec: - name: WEB_SERVICE_URL value: {{ template "pulsar.web.internal.service.url" . }} - name: KOP_SERVICE_URL - value: {{ .Values.broker.advertisedDomain }}:9093 + {{- if and .Values.broker.kop.enabled .Values.broker.kop.tls.enabled }} + value: "{{ .Values.broker.advertisedDomain }}:{{ .Values.broker.kop.ports.ssl }}" + {{- else }} + value: "{{ .Values.broker.advertisedDomain }}:{{ .Values.broker.kop.ports.plaintext }}" + {{- end }} {{- if .Values.streamnative_console.login.sso.google.enabled }} - name: GOOGLE_OAUTH2_ENABLED value: "true" diff --git a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml index 50406506..29033f61 100644 --- a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml +++ b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml @@ -138,7 +138,11 @@ spec: - name: WEB_SERVICE_URL value: {{ template "pulsar.web.internal.service.url" . }} - name: KOP_SERVICE_URL - value: {{ .Values.broker.advertisedDomain }}:9093 + {{- if and .Values.broker.kop.enabled .Values.broker.kop.tls.enabled }} + value: "{{ .Values.broker.advertisedDomain }}:{{ .Values.broker.kop.ports.ssl }}" + {{- else }} + value: "{{ .Values.broker.advertisedDomain }}:{{ .Values.broker.kop.ports.plaintext }}" + {{- end }} {{- if .Values.streamnative_console.login.sso.google.enabled }} - name: GOOGLE_OAUTH2_ENABLED value: "true"