From dfd2afa1d3f8ed2ca4e9d86752be65bb1a17df2c Mon Sep 17 00:00:00 2001
From: Eric Shen <ericshenyuhao@outlook.com>
Date: Sun, 29 Dec 2024 23:58:00 +0800
Subject: [PATCH] Fix console (#1198)

<!--
### 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

*(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

Fix the issue involed from the PR
https://github.com/streamnative/charts/pull/1191

### 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)

- [x] `no-need-doc`

  (Please explain why)

- [ ] `doc`

  (If this PR contains doc changes)

---------

Signed-off-by: ericsyh <ericshenyuhao@outlook.com>
(cherry picked from commit d6e5e2d9fe2a87029bc9d30650c30888e5d822d3)
---
 .../streamnative-console-statefulset.yaml                     | 4 ++--
 .../streamnative-console-statefulset.yaml                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
index 0a143c6f..f2b1998f 100644
--- a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
+++ b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -226,7 +226,7 @@ spec:
           - name: JWT_BROKER_TOKEN_MODE
             value: SECRET
           - name: JWT_BROKER_SECRET_KEY_PATH
-            value: {{ "/pulsar-manager/keys/" }} + {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH | default "token/secret.key" }}
+            value: {{ "/pulsar-manager/keys" }}/{{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_FILE | default "token/secret.key" }}
           {{- end }}
           {{- end }}
           {{- if or .Values.streamnative_console.login.sso.google.enabled .Values.streamnative_console.login.sso.azure.enabled .Values.streamnative_console.login.sso.okta.enabled .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
@@ -299,7 +299,7 @@ spec:
           {{- end }}
           {{- if eq .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_TOKEN_MODE "SECRET" }}
           - key: SECRETKEY
-            path: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH | default "token/secret.key" }}  
+            path: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_FILE | default "token/secret.key" }}  
           secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY }}
           {{- end }}
       {{- end }}
diff --git a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
index 29033f61..3228e4ae 100644
--- a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
+++ b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -232,7 +232,7 @@ spec:
           - name: JWT_BROKER_TOKEN_MODE
             value: SECRET
           - name: JWT_BROKER_SECRET_KEY_PATH
-            value: {{ "/pulsar-manager/keys/" }} + {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH | default "token/secret.key" }}
+            value: {{ "/pulsar-manager/keys" }}/{{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_FILE | default "token/secret.key" }}
           {{- end }}
           {{- end }}
           {{- if or .Values.auth.vault.enabled .Values.streamnative_console.login.sso.google.enabled .Values.streamnative_console.login.sso.azure.enabled .Values.streamnative_console.login.sso.okta.enabled .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
@@ -309,7 +309,7 @@ spec:
           {{- end }}
           {{- if eq .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_TOKEN_MODE "SECRET" }}
           - key: SECRETKEY
-            path: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH | default "token/secret.key" }} 
+            path: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_FILE | default "token/secret.key" }} 
           secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY }}
           {{- end }}
       {{- end }}