update ks-core helm chart

kubesphere · Feb 4, 2024 · f05a120 · f05a120
1 parent dd2fde5
commit f05a120
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 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.1
+version: 0.6.2
 
 # 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
@@ -78,7 +78,9 @@ Create the name of the service account to use
 {{- if eq .Values.role "host" }}
 {{- with lookup "v1" "ConfigMap" (printf "%s" .Release.Namespace) "kubesphere-config" }}
 {{- with (fromYaml (index .data "kubesphere.yaml")) }}
-{{- if and .authentication (.authentication).issuer ((.authentication).issuer).jwtSecret }}
+{{- if and .authentication (.authentication).jwtSecret }}
+{{- .authentication.jwtSecret }}
+{{- else if and .authentication (.authentication).issuer ((.authentication).issuer).jwtSecret }}
 {{- .authentication.issuer.jwtSecret }}
 {{- else }}
 {{- $.Values.authentication.issuer.jwtSecret | default (randAlphaNum 32 ) }}
@@ -128,4 +130,4 @@ Returns user's password or use default. Used by NOTES.txt
 {{- else }}
 {{- end }}
 {{- printf "%s" $address }}
-{{- end }}
+{{- end }}
diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml
@@ -267,8 +267,7 @@ nodeShell:
 
 extension:
   imageRegistry: ""
-  nodeSelector:
-    key: value
+  nodeSelector: {}
 
 upgrade:
   disabled: true
@@ -445,7 +444,7 @@ upgrade:
       configMapKey: "chart.tgz"
       configMapNamespace: "kubesphere-system"
       chartsPath: ""
-      installationMode: HostOnly
+      installationMode: Multicluster
   servicemesh:
     disabled: false
     priority: 100
@@ -457,10 +456,10 @@ upgrade:
       configMapKey: "chart.tgz"
       configMapNamespace: "kubesphere-system"
       chartsPath: ""
-      installationMode: HostOnly
+      installationMode: Multicluster
       config: |
         kiali:
-          prometheus_url: http://prometheus-operated.kubesphere-monitoring-system.svc:9090
+          prometheus_url: http://prometheus-k8s.kubesphere-monitoring-system.svc:9090
         jaeger:
           storage:
             options:
@@ -619,7 +618,7 @@ upgrade:
       configMapKey: "chart.tgz"
       configMapNamespace: "kubesphere-system"
       chartsPath: ""
-      installationMode: HostOnly
+      installationMode: Multicluster
 
   whizard-auditing:
     disabled: false