Skip to content

Update toolset configmap service url #1265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tuteng merged 3 commits into from
Apr 9, 2026
Merged

Update toolset configmap service url #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7bf91e
Update toolset configmap service url
tuteng Mar 9, 2026
eea815f
Fix toolset proxy web URL for ingress service
tuteng Apr 9, 2026
e34172a
Fix toolset proxy broker URL for ingress service
tuteng Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 102 additions & 6 deletions charts/sn-platform-slim/templates/toolset/_toolset.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,106 @@ Define toolset TLS certificate secret name
{{- end -}}
{{- end -}}

{{/*
Define the proxy service host for toolset (ingress when proxy ingress is enabled, else headless).
Toolset uses this so pulsar-admin and client commands reach the proxy via the ingress service.
*/}}
{{- define "toolset.proxy.service.host" -}}
{{- if and .Values.ingress.proxy.enabled (ne .Values.ingress.proxy.type "IstioGateway") -}}
{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-ingress
{{- else -}}
{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless
{{- end -}}
{{- end -}}

{{/*
Whether toolset resolves the proxy through the ingress service.
*/}}
{{- define "toolset.proxy.service.usesIngress" -}}
{{- if and .Values.ingress.proxy.enabled (ne .Values.ingress.proxy.type "IstioGateway") -}}
true
{{- else -}}
false
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy web service scheme.
*/}}
{{- define "toolset.proxy.web.service.scheme" -}}
{{- if eq (include "toolset.proxy.service.usesIngress" .) "true" -}}
{{- if or (and .Values.tls.enabled .Values.tls.proxy.enabled) .Values.ingress.proxy.tls.enabled -}}
https
{{- else -}}
http
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
https
{{- else -}}
http
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy web service port.
*/}}
{{- define "toolset.proxy.web.service.port" -}}
{{- if eq (include "toolset.proxy.service.usesIngress" .) "true" -}}
{{- if eq (include "toolset.proxy.web.service.scheme" .) "https" -}}
{{ .Values.proxy.ports.https }}
{{- else if .Values.ingress.proxy.httpPortOverride -}}
{{ .Values.ingress.proxy.httpPortOverride }}
{{- else -}}
{{ .Values.proxy.ports.http }}
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
{{ .Values.proxy.ports.https }}
{{- else -}}
{{ .Values.proxy.ports.http }}
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy broker service scheme.
*/}}
{{- define "toolset.proxy.broker.service.scheme" -}}
{{- if eq (include "toolset.proxy.service.usesIngress" .) "true" -}}
{{- if or (and .Values.tls.enabled .Values.tls.proxy.enabled) .Values.ingress.proxy.tls.enabled -}}
pulsar+ssl
{{- else -}}
pulsar
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
pulsar+ssl
{{- else -}}
pulsar
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy broker service port.
*/}}
{{- define "toolset.proxy.broker.service.port" -}}
{{- if eq (include "toolset.proxy.broker.service.scheme" .) "pulsar+ssl" -}}
{{ .Values.proxy.ports.pulsarssl }}
{{- else -}}
{{ .Values.proxy.ports.pulsar }}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy broker service url.
*/}}
{{- define "toolset.proxy.broker.service.url" -}}
{{ template "toolset.proxy.broker.service.scheme" . }}://{{ template "toolset.proxy.service.host" . }}:{{ template "toolset.proxy.broker.service.port" . }}
{{- end -}}

{{/*
Define the toolset web service url
*/}}
Expand All @@ -168,11 +268,7 @@ https://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Va
http://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.http }}
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
https://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}:{{ .Values.proxy.ports.https }}
{{- else -}}
http://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}:{{ .Values.proxy.ports.http }}
{{- end -}}
{{ template "toolset.proxy.web.service.scheme" . }}://{{ template "toolset.proxy.service.host" . }}:{{ template "toolset.proxy.web.service.port" . }}
{{- end -}}
{{- end -}}

Expand Down Expand Up @@ -210,4 +306,4 @@ Define toolset pulsarctl config volumes
{{- else -}}
{{ .Values.toolset.serviceAccount.name }}
{{- end -}}
{{- end -}}
{{- end -}}
12 changes: 4 additions & 8 deletions charts/sn-platform-slim/templates/toolset/toolset-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,17 @@ data:
{{- end }}
{{- end }}
{{- if .Values.toolset.useProxy }}
# talk to proxy
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled }}
webServiceUrl: "https://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.https }}/"
brokerServiceUrl: "pulsar+ssl://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.pulsarssl }}/"
# talk to proxy (use proxy-ingress when ingress enabled so pulsar-admin works from Toolset pod)
webServiceUrl: "{{ template "toolset.web.service.url" . }}/"
brokerServiceUrl: "{{ template "toolset.proxy.broker.service.url" . }}/"
{{- if or (and .Values.tls.enabled .Values.tls.proxy.enabled) .Values.ingress.proxy.tls.enabled }}
useTls: "true"
tlsAllowInsecureConnection: "false"
{{- if .Values.tls.proxy.untrustedCa }}
tlsTrustCertsFilePath: "/pulsar/certs/proxy-ca/ca.crt"
{{- end }}
tlsEnableHostnameVerification: "false"
{{- end }}
{{- if not (and .Values.tls.enabled .Values.tls.proxy.enabled) }}
webServiceUrl: "http://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.http }}/"
brokerServiceUrl: "pulsar://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.pulsar }}/"
{{- end }}
{{- end }}
# Authentication Settings
{{- if .Values.auth.authentication.enabled }}
Expand Down
108 changes: 102 additions & 6 deletions charts/sn-platform/templates/toolset/_toolset.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,106 @@ Define toolset TLS certificate secret name
{{- end -}}
{{- end -}}

{{/*
Define the proxy service host for toolset (ingress when proxy ingress is enabled, else headless).
Toolset uses this so pulsar-admin and client commands reach the proxy via the ingress service.
*/}}
{{- define "toolset.proxy.service.host" -}}
{{- if and .Values.ingress.proxy.enabled (ne .Values.ingress.proxy.type "IstioGateway") -}}
{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-ingress
{{- else -}}
{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless
{{- end -}}
{{- end -}}

{{/*
Whether toolset resolves the proxy through the ingress service.
*/}}
{{- define "toolset.proxy.service.usesIngress" -}}
{{- if and .Values.ingress.proxy.enabled (ne .Values.ingress.proxy.type "IstioGateway") -}}
true
{{- else -}}
false
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy web service scheme.
*/}}
{{- define "toolset.proxy.web.service.scheme" -}}
{{- if eq (include "toolset.proxy.service.usesIngress" .) "true" -}}
{{- if or (and .Values.tls.enabled .Values.tls.proxy.enabled) .Values.ingress.proxy.tls.enabled -}}
https
{{- else -}}
http
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
https
{{- else -}}
http
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy web service port.
*/}}
{{- define "toolset.proxy.web.service.port" -}}
{{- if eq (include "toolset.proxy.service.usesIngress" .) "true" -}}
{{- if eq (include "toolset.proxy.web.service.scheme" .) "https" -}}
{{ .Values.proxy.ports.https }}
{{- else if .Values.ingress.proxy.httpPortOverride -}}
{{ .Values.ingress.proxy.httpPortOverride }}
{{- else -}}
{{ .Values.proxy.ports.http }}
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
{{ .Values.proxy.ports.https }}
{{- else -}}
{{ .Values.proxy.ports.http }}
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy broker service scheme.
*/}}
{{- define "toolset.proxy.broker.service.scheme" -}}
{{- if eq (include "toolset.proxy.service.usesIngress" .) "true" -}}
{{- if or (and .Values.tls.enabled .Values.tls.proxy.enabled) .Values.ingress.proxy.tls.enabled -}}
pulsar+ssl
{{- else -}}
pulsar
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
pulsar+ssl
{{- else -}}
pulsar
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy broker service port.
*/}}
{{- define "toolset.proxy.broker.service.port" -}}
{{- if eq (include "toolset.proxy.broker.service.scheme" .) "pulsar+ssl" -}}
{{ .Values.proxy.ports.pulsarssl }}
{{- else -}}
{{ .Values.proxy.ports.pulsar }}
{{- end -}}
{{- end -}}

{{/*
Define the toolset proxy broker service url.
*/}}
{{- define "toolset.proxy.broker.service.url" -}}
{{ template "toolset.proxy.broker.service.scheme" . }}://{{ template "toolset.proxy.service.host" . }}:{{ template "toolset.proxy.broker.service.port" . }}
{{- end -}}

{{/*
Define the toolset web service url
*/}}
Expand All @@ -216,11 +316,7 @@ https://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Va
http://{{ template "pulsar.fullname" . }}-{{ .Values.broker.component }}:{{ .Values.broker.ports.http }}
{{- end -}}
{{- else -}}
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled -}}
https://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}:{{ .Values.proxy.ports.https }}
{{- else -}}
http://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}:{{ .Values.proxy.ports.http }}
{{- end -}}
{{ template "toolset.proxy.web.service.scheme" . }}://{{ template "toolset.proxy.service.host" . }}:{{ template "toolset.proxy.web.service.port" . }}
{{- end -}}
{{- end -}}

Expand Down Expand Up @@ -259,4 +355,4 @@ Define toolset pulsarctl config volumes
{{- else -}}
{{ .Values.toolset.serviceAccount.name }}
{{- end -}}
{{- end -}}
{{- end -}}
12 changes: 4 additions & 8 deletions charts/sn-platform/templates/toolset/toolset-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,17 @@ data:
{{- end }}
{{- end }}
{{- if .Values.toolset.useProxy }}
# talk to proxy
{{- if and .Values.tls.enabled .Values.tls.proxy.enabled }}
webServiceUrl: "https://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.https }}/"
brokerServiceUrl: "pulsar+ssl://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.pulsarssl }}/"
# talk to proxy (use proxy-ingress when ingress enabled so pulsar-admin works from Toolset pod)
webServiceUrl: "{{ template "toolset.web.service.url" . }}/"
brokerServiceUrl: "{{ template "toolset.proxy.broker.service.url" . }}/"
{{- if or (and .Values.tls.enabled .Values.tls.proxy.enabled) .Values.ingress.proxy.tls.enabled }}
useTls: "true"
tlsAllowInsecureConnection: "false"
{{- if .Values.tls.proxy.untrustedCa }}
tlsTrustCertsFilePath: "/pulsar/certs/proxy-ca/ca.crt"
{{- end }}
tlsEnableHostnameVerification: "false"
{{- end }}
{{- if not (and .Values.tls.enabled .Values.tls.proxy.enabled) }}
webServiceUrl: "http://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.http }}/"
brokerServiceUrl: "pulsar://{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}-headless:{{ .Values.proxy.ports.pulsar }}/"
{{- end }}
{{- end }}
# Authentication Settings
{{- if .Values.auth.authentication.enabled }}
Expand Down
Loading