update ks-core helm chart

kubesphere · Mar 1, 2024 · 8b1511d · 8b1511d
1 parent 4d977d9
commit 8b1511d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.4
+version: 0.6.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/src/test/ks-core/templates/_helpers.tpl b/src/test/ks-core/templates/_helpers.tpl
@@ -75,7 +75,7 @@ Create the name of the service account to use
 {{- end }}
 
 {{- define "jwtSecret" -}}
-{{- if eq .Values.role "host" }}
+{{- if eq .Values.authentication.issuer.jwtSecret "" }}
 {{- with lookup "v1" "ConfigMap" (printf "%s" .Release.Namespace) "kubesphere-config" }}
 {{- with (fromYaml (index .data "kubesphere.yaml")) }}
 {{- if and .authentication (.authentication).jwtSecret }}

diff --git a/src/test/ks-core/templates/globalroles.yaml b/src/test/ks-core/templates/globalroles.yaml
@@ -129,6 +129,13 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - cluster.kubesphere.io
+    resources:
+      - 'labels'
+    verbs:
+      - get
+      - list
   - nonResourceURLs:
       - '/static/images/*'
     verbs:

diff --git a/src/test/ks-core/templates/kubesphere-config.yaml b/src/test/ks-core/templates/kubesphere-config.yaml
@@ -14,11 +14,11 @@ data:
         jwtSecret: {{ include "jwtSecret" . | quote }}
         maximumClockSkew: {{ .Values.authentication.issuer.maximumClockSkew | default "10s" }}
         {{- if eq .Values.role "member" }}
-        accessTokenMaxAge: 0
+        accessTokenMaxAge: 0s
         {{- else }}
-        accessTokenMaxAge:  {{ .Values.authentication.issuer.accessTokenMaxAge }}
+        accessTokenMaxAge: {{ .Values.authentication.issuer.accessTokenMaxAge }}
         {{- end }}
-        accessTokenInactivityTimeout:  {{ .Values.authentication.issuer.accessTokenInactivityTimeout }}
+        accessTokenInactivityTimeout: {{ .Values.authentication.issuer.accessTokenInactivityTimeout }}
     multicluster:
       clusterRole: {{ .Values.role }}
     terminal: