Skip to content

Commit b096010

Browse files
tutengclaude
andauthored
fix: Resolve mountPath conflict when OIDC and JWT auth are both enabled (#1272)
<!-- ### Contribution Checklist - Name the pull request in the form "[charts/<chart-name>] Title of the pull request". Skip *[charts/<chart-name>]* if the PR doesn't change a specific chart. E.g. `[docs] Fix typo in README`. - Fill out the template below to describe the changes contributed by the pull request. That will give reviewers the context they need to do the review. - Each pull request should address only one issue, not mix up code from multiple issues. - Each commit in the pull request has a meaningful commit message - Once all items of the checklist are addressed, remove the above text and this checklist, leaving only the filled out template below. **(The sections below can be removed for hotfixes of typos)** --> *(If this PR fixes a github issue, please add `Fixes #<xyz>`.)* Fixes #<xyz> *(or if this PR is one task of a github issue, please add `Master Issue: #<xyz>` to link to the master issue.)* Master Issue: #<xyz> ### Motivation *Explain here the context, and why you're making that change. What is the problem you're trying to solve.* ### Modifications *Describe the modifications you've done.* ### Verifying this change - [ ] Make sure that the change passes the CI checks. *(Please pick either of the following options)* This change is a trivial rework / code cleanup without any test coverage. *(or)* This change is already covered by existing tests, such as *(please describe tests)*. *(or)* This change added tests and can be verified as follows: *(example:)* - *Added integration tests for end-to-end deployment with large payloads (10MB)* - *Extended integration test for recovery after broker failure* ### Documentation Check the box below. Need to update docs? - [ ] `doc-required` (If you need help on updating docs, create a doc issue) - [ ] `no-need-doc` (Please explain why) - [ ] `doc` (If this PR contains doc changes) --------- Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 91c6375 commit b096010

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

charts/sn-platform-slim/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ Define function for get authenticaiton secret
345345
{{- define "pulsar.authSecret" }}
346346
{{- if .Values.auth.authentication.enabled }}
347347
{{- if and .Values.auth.oauth.enabled .Values.auth.oauth.brokerClientCredentialSecret }}
348-
- mountPath: /mnt/secrets
348+
- mountPath: /mnt/secrets/oauth
349349
secretName: "{{ .Values.auth.oauth.brokerClientCredentialSecret }}"
350350
{{- end }}
351351
{{- if .Values.auth.authentication.jwt.enabled }}

charts/sn-platform-slim/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ auth:
338338
# --from-literal=broker_client_credential.json=$(echo -n '{"client_id":"your-client-id","client_secret":"your-client-secret","issuer_url":"http://your-issuer-url/"}') \
339339
# -n your-namespace
340340
# brokerClientCredentialSecret: "my-secret"
341-
# brokerClientAuthenticationParameters: {"privateKey":"file:///mnt/secrets/broker_client_credential.json", "issuerUrl":"https://login.microsoftonline.com/your-tenant-id/v2.0", "audience":"your-audience", "scope":"your-scope"}
341+
# brokerClientAuthenticationParameters: {"privateKey":"file:///mnt/secrets/oauth/broker_client_credential.json", "issuerUrl":"https://login.microsoftonline.com/your-tenant-id/v2.0", "audience":"your-audience", "scope":"your-scope"}
342342
authenticationProvider: "io.streamnative.pulsar.broker.authentication.AuthenticationProviderOAuth"
343343
authorizationProvider: "io.streamnative.pulsar.broker.authorization.AuthorizationProviderOAuth"
344344

charts/sn-platform/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ auth:
398398
# --from-literal=broker_client_credential.json=$(echo -n '{"client_id":"your-client-id","client_secret":"your-client-secret","issuer_url":"http://your-issuer-url/"}') \
399399
# -n your-namespace
400400
# brokerClientCredentialSecret: "my-secret"
401-
# brokerClientAuthenticationParameters: {"privateKey":"file:///mnt/secrets/broker_client_credential.json", "issuerUrl":"https://login.microsoftonline.com/your-tenant-id/v2.0", "audience":"your-audience", "scope":"your-scope"}
401+
# brokerClientAuthenticationParameters: {"privateKey":"file:///mnt/secrets/oauth/broker_client_credential.json", "issuerUrl":"https://login.microsoftonline.com/your-tenant-id/v2.0", "audience":"your-audience", "scope":"your-scope"}
402402
authenticationProvider: "io.streamnative.pulsar.broker.authentication.AuthenticationProviderOAuth"
403403
authorizationProvider: "io.streamnative.pulsar.broker.authorization.AuthorizationProviderOAuth"
404404

0 commit comments

Comments
 (0)