add extra configuration for Console JWT auth

Signed-off-by: ericsyh <[email protected]>
streamnative · Nov 19, 2024 · d86197a · d86197a
1 parent a2ca2d8
commit d86197a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 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
@@ -205,7 +205,7 @@ spec:
           - name: JWT_BROKER_TOKEN_MODE
             value: SECRET
           - name: JWT_BROKER_SECRET_KEY_PATH
-            value: /pulsar-manager/keys/token/secret.key
+            value: {{ "/pulsar-manager/keys/" }} + {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH }}
           {{- 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 }}
@@ -278,7 +278,7 @@ spec:
           {{- end }}
           {{- if eq .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_TOKEN_MODE "SECRET" }}
           - key: SECRETKEY
-            path: token/secret.key
+            path: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH }}
           secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY }}
           {{- end }}
       {{- end }}

diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
@@ -2126,6 +2126,7 @@ streamnative_console:
           JWT_BROKER_PUBLIC_PRIVATE_KEY: ""
           # The secret should contain both `SECRETKEY`
           JWT_BROKER_SECRET_KEY: ""
+          JWT_BROKER_SECRET_KEY_FILE: "token/secret.key"
 
 ## Components Stack: pulsar operators rbac
 ## templates/pulsar-operators-rbac.yaml

diff --git a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -211,7 +211,7 @@ spec:
           - name: JWT_BROKER_TOKEN_MODE
             value: SECRET
           - name: JWT_BROKER_SECRET_KEY_PATH
-            value: /pulsar-manager/keys/token/secret.key
+            value: {{ "/pulsar-manager/keys/" }} + {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH }}
           {{- 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 }}
@@ -288,7 +288,7 @@ spec:
           {{- end }}
           {{- if eq .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_TOKEN_MODE "SECRET" }}
           - key: SECRETKEY
-            path: token/secret.key
+            path: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_PATH }}
           secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY }}
           {{- end }}
       {{- end }}

diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
@@ -2216,6 +2216,7 @@ streamnative_console:
           JWT_BROKER_PUBLIC_PRIVATE_KEY: ""
           # The secret should contain both `SECRETKEY`
           JWT_BROKER_SECRET_KEY: ""
+          JWT_BROKER_SECRET_KEY_FILE: "token/secret.key"
 
 ## Components Stack: pulsar operators rbac
 ## templates/pulsar-operators-rbac.yaml