Skip to content

Fixed vault authentication params #1253

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 2 commits into from
Nov 11, 2025
Merged

Fixed vault authentication params #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c503fc
Fixed vault authentication params
tuteng Nov 10, 2025
da8b6a1
Fixed params
tuteng Nov 10, 2025
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
15 changes: 6 additions & 9 deletions charts/sn-platform/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ Define function for get authenticaiton environment variable
key: PULSAR_PREFIX_OIDCTokenAudienceID
{{- if and (eq .Component "proxy") .Values.auth.superUsers.proxyRolesEnabled }}
- name: brokerClientAuthenticationParameters
value: "file:///mnt/token/TOKEN"
value: "file:///mnt/vault/PROXY_brokerClientAuthenticationParameters"
{{- else }}
- name: brokerClientAuthenticationParameters
value: "file:///mnt/token/TOKEN"
value: "file:///mnt/vault/brokerClientAuthenticationParameters"
{{- end }}
{{- end }}
{{- if .Values.auth.authentication.jwt.enabled }}
Expand Down Expand Up @@ -291,17 +291,14 @@ Define function for get authenticaiton secret
secretName: "{{ .Values.auth.oauth.brokerClientCredentialSecret }}"
{{- end }}
{{- if and .Values.auth.vault.enabled (or .Values.broker.readPublicKeyFromFile .Values.proxy.readPublicKeyFromFile) }}
{{- if and (eq .Component "proxy") .Values.auth.superUsers.proxyRolesEnabled }}
- mountPath: /mnt/token
secretName: {{ .Release.Name }}-token-proxy-admin
{{- else }}
- mountPath: /mnt/token
secretName: {{ .Release.Name }}-token-admin
{{- end }}
- mountPath: {{ default "/pulsar/vault/v1/identity/oidc/.well-known/keys" .Values.broker.publicKeyPath }}
{{ $defaultSecretName := print (include "pulsar.fullname" .) "-" .Values.vault.component "-public-key" }}
secretName: {{ default $defaultSecretName .Values.broker.publicKeySecret }}
{{- end }}
{{- if .Values.auth.vault.enabled }}
- mountPath: /mnt/vault
secretName: {{ template "pulsar.fullname" . }}-vault-secret-env-injection
{{- end }}
{{- if .Values.auth.authentication.jwt.enabled }}
{{- if and (eq .Component "proxy") .Values.auth.superUsers.proxyRolesEnabled }}
- mountPath: /mnt/token
Expand Down
4 changes: 2 additions & 2 deletions charts/sn-platform/templates/broker/broker-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ spec:
{{ toYaml . | indent 6 }}
{{- end }}
{{- end }}
{{- if or (and .Values.auth.vault.enabled .Values.broker.readPublicKeyFromFile) (and .Values.broker.offload.gcs.enabled .Values.broker.offload.gcs.secret) .Values.broker.extraSecretRefs .Values.auth.oauth.enabled .Values.auth.authentication.jwt.enabled }}
{{- if or .Values.auth.vault.enabled (and .Values.broker.offload.gcs.enabled .Values.broker.offload.gcs.secret) .Values.broker.extraSecretRefs .Values.auth.oauth.enabled .Values.auth.authentication.jwt.enabled }}
secretRefs:
{{- if .Values.broker.offload.gcs.secret }}
- mountPath: /pulsar/srvaccts/gcs.json
Expand All @@ -93,7 +93,7 @@ spec:
{{- with .Values.broker.extraSecretRefs }}
{{ toYaml . | indent 4 }}
{{- end }}
{{- if or .Values.auth.oauth.enabled .Values.auth.authentication.jwt.enabled (and .Values.auth.vault.enabled .Values.broker.readPublicKeyFromFile) }}
{{- if or .Values.auth.oauth.enabled .Values.auth.authentication.jwt.enabled .Values.auth.vault.enabled }}
{{- include "pulsar.authSecret" (dict "Values" .Values "Component" .Values.broker.component "Release" .Release "Chart" .Chart) | indent 4 }}
{{- end }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/sn-platform/templates/proxy/proxy-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
{{ toYaml . | indent 6 }}
{{- end }}
{{- end }}
{{- if or (and .Values.auth.vault.enabled .Values.proxy.readPublicKeyFromFile) .Values.proxy.extraSecretRefs .Values.auth.oauth.enabled .Values.auth.authentication.jwt.enabled }}
{{- if or .Values.auth.vault.enabled .Values.proxy.extraSecretRefs .Values.auth.oauth.enabled .Values.auth.authentication.jwt.enabled }}
secretRefs:
{{- with .Values.proxy.extraSecretRefs }}
{{ toYaml . | indent 4 }}
Expand Down
Loading