Merge pull request #356 from kubesphere/sync/ks-core

Update ks-core helm chart
kubesphere · Feb 2, 2024 · dd2fde5 · dd2fde5
2 parents 526e387 + 7eef806
commit dd2fde5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml
@@ -7,9 +7,9 @@ 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.0
+version: 0.6.1
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "v4.1.0-dev"
+appVersion: "v4.1.0-alpha.0"
diff --git a/src/test/ks-core/templates/_helpers.tpl b/src/test/ks-core/templates/_helpers.tpl
@@ -98,21 +98,21 @@ Create the name of the service account to use
 Returns user's password or use default
 */}}
 {{- define "getOrDefaultPass" }}
-{{- if not .Values.adminPassword -}}
+{{- if not .Values.authentication.adminPassword -}}
 {{- printf "$2a$10$zcHepmzfKPoxCVCYZr5K7ORPZZ/ySe9p/7IUb/8u./xHrnSX2LOCO" -}}
 {{- else -}}
-{{- printf "%s" .Values.adminPassword -}}
+{{- printf "%s" .Values.authentication.adminPassword -}}
 {{- end -}}
 {{- end }}
 
 {{/*
 Returns user's password or use default. Used by NOTES.txt
 */}}
 {{- define "printOrDefaultPass" }}
-{{- if not .Values.adminPassword -}}
+{{- if not .Values.authentication.adminPassword -}}
 {{- printf "P@88w0rd" -}}
 {{- else -}}
-{{- printf "%s" .Values.adminPassword -}}
+{{- printf "%s" .Values.authentication.adminPassword -}}
 {{- end -}}
 {{- end }}
 

diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml
@@ -2,7 +2,7 @@
 ## @param global.tag Global Docker image tag
 global:
   imageRegistry: registry.cn-beijing.aliyuncs.com
-  tag: ksc
+  tag: v4.1.0-alpha.0
   imagePullSecrets: []
 
 ## @param nameOverride String to partially override common.names.fullname
@@ -31,13 +31,12 @@ portal:
 #  https:
 #    port: 30443
 
-adminPassword: ""
-
 authentication:
   authenticateRateLimiterMaxTries: 10
   authenticationRateLimiterDuration: 10m0s
   loginHistoryRetentionPeriod: 168h
   enableMultiLogin: true
+  adminPassword: ""
   issuer:
     maximumClockSkew: 10s
     # Jwt Secret is required by ks-apiserver, a random string would be generated if it's empty