support auth with both jwt and vault

Signed-off-by: ericsyh <[email protected]>
streamnative · Jan 8, 2025 · eebed2b · eebed2b
1 parent d6e5e2d
commit eebed2b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/charts/sn-platform/templates/_helpers.tpl b/charts/sn-platform/templates/_helpers.tpl
@@ -218,7 +218,7 @@ PULSAR_PREFIX_OIDCPublicKeyPath: file://{{ .Values.broker.publicKeyPath | defaul
 PULSAR_PREFIX_OIDCPublicKeyPath: "{{ template "pulsar.vault.url" . }}/v1/identity/oidc/.well-known/keys"
 {{- end }}
 {{- end }}
-{{- if .Values.auth.oauth.enabled }}
+{{- if and .Values.auth.oauth.enabled (not (or .Values.auth.vault.enabled .Values.auth.authentication.jwt.enabled)) }}
 PULSAR_PREFIX_oauthIssuerUrl: "{{ .Values.auth.oauth.oauthIssuerUrl }}"
 PULSAR_PREFIX_oauthAudience: "{{ .Values.auth.oauth.oauthAudience }}"
 {{- if .Values.auth.oauth.oauthAdminScope }}
@@ -239,7 +239,7 @@ brokerClientAuthenticationParameters: '{{ .Values.auth.oauth.brokerClientAuthent
 PULSAR_PREFIX_oauthSubjectClaim: "{{ .Values.auth.oauth.oauthSubjectClaim }}"
 {{- end }}
 {{- else }}
-{{- if .Values.auth.authentication.jwt.enabled }}
+{{- if and .Values.auth.authentication.jwt.enabled (not (or .Values.auth.oauth.enabled .Values.auth.vault.enabled))}}
 brokerClientAuthenticationPlugin: "org.apache.pulsar.client.impl.auth.AuthenticationToken"
 {{- end }}
 {{- end }}