fix: duplicate brokerClientAuthenticationPlugin definition when oauth…

… and jwt are enabled simultaneously (#1160) Fix duplicate brokerClientAuthenticationPlugin definition when oauth and jwt are enabled simultaneously (cherry picked from commit 93af2bb)
streamnative · May 24, 2024 · 58b7e7b · 58b7e7b
1 parent e6d2618
commit 58b7e7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/charts/sn-platform-slim/templates/_helpers.tpl b/charts/sn-platform-slim/templates/_helpers.tpl
@@ -217,11 +217,12 @@ brokerClientAuthenticationParameters: '{{ .Values.auth.oauth.brokerClientAuthent
 {{- if .Values.auth.oauth.oauthSubjectClaim }}
 PULSAR_PREFIX_oauthSubjectClaim: "{{ .Values.auth.oauth.oauthSubjectClaim }}"
 {{- end }}
-{{- end }}
+{{- else }}
 {{- if .Values.auth.authentication.jwt.enabled }}
 brokerClientAuthenticationPlugin: "org.apache.pulsar.client.impl.auth.AuthenticationToken"
 {{- end }}
 {{- end }}
+{{- end }}
 
 {{/*
 Define function for get authenticaiton environment variable

diff --git a/charts/sn-platform/templates/_helpers.tpl b/charts/sn-platform/templates/_helpers.tpl
@@ -229,11 +229,12 @@ brokerClientAuthenticationParameters: '{{ .Values.auth.oauth.brokerClientAuthent
 {{- if .Values.auth.oauth.oauthSubjectClaim }}
 PULSAR_PREFIX_oauthSubjectClaim: "{{ .Values.auth.oauth.oauthSubjectClaim }}"
 {{- end }}
-{{- end }}
+{{- else }}
 {{- if .Values.auth.authentication.jwt.enabled }}
 brokerClientAuthenticationPlugin: "org.apache.pulsar.client.impl.auth.AuthenticationToken"
 {{- end }}
 {{- end }}
+{{- end }}
 
 {{/*
 Define function for get authenticaiton environment variable