Update ks-core helm chart

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.21
+version: 0.6.22
 
 # 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

src/test/ks-core/crds/kubesphere.io_repositories.yaml

@@ -49,6 +49,9 @@ spec:
                   username:
                     type: string
                 type: object
+              caBundle:
+                description: if the caBundle is empty, use --insecure-skip-tls-verify.
+                type: string
               description:
                 type: string
               image:

src/test/ks-core/templates/NOTES.txt

@@ -8,6 +8,7 @@ Please be patient and wait for several seconds for the KubeSphere deployment to
 
     kubectl get pods -n {{ .Release.Namespace }}
 
+{{- if or (eq .Values.role "") (eq .Values.role "host") }}
 2. Access the KubeSphere Console
 
     Once the deployment is complete, you can access the KubeSphere console using the following URL:  {{"\n"}}
@@ -25,5 +26,14 @@ Please be patient and wait for several seconds for the KubeSphere deployment to
     Password: {{ include "printOrDefaultPass" . }}
 
 NOTE: It is highly recommended to change the default password immediately after the first login.
+{{- else }}
 
+Cluster Member Installed Successfully!
+
+Congratulations! The cluster member has been successfully installed.
+
+You can view the information of the member cluster by accessing the ks-console of the host cluster.
+
+Happy deploying!
+{{- end }}
 For additional information and details, please visit https://kubesphere.io.

src/test/ks-core/templates/_helpers.tpl

@@ -58,6 +58,13 @@ Create the name of the service account to use
 {{- default "kubesphere" .Values.serviceAccount.name }}
 {{- end }}
 
+{{/*
+Create the name of the secret of sa token.
+*/}}
+{{- define "ks-core.serviceAccountTokenName" -}}
+{{-  printf "%s-%s" ( include "ks-core.serviceAccountName" . )   "sa-token" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
 {{- define "portal.host" -}}
 {{- if and .Values.portal.https (.Values.portal.https).port }}
 {{- if eq (int .Values.portal.https.port) 443 }}

src/test/ks-core/templates/kubesphere-config.yaml

@@ -40,6 +40,7 @@ data:
     helmExecutor:
       image: {{ template "helm.image" . }}
       timout: {{ .Values.helmExecutor.timeout }}
+      historyMax: {{ .Values.helmExecutor.historyMax }}
     extension:
       imageRegistry: {{ default .Values.extension.imageRegistry "" | quote }}
       {{- if .Values.extension.nodeSelector }}

src/test/ks-core/templates/serviceaccount.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.serviceAccount.create -}}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -11,6 +12,27 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 
+{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.GitVersion -}}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "ks-core.serviceAccountTokenName" . }}
+  labels:
+    {{- include "ks-core.labels" . | nindent 4 }}
+  {{- if .Values.serviceAccount.annotations }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+    kubernetes.io/service-account.name: {{ include "ks-core.serviceAccountName" . }}
+    {{- end }}
+  {{- else }}
+  annotations:
+    kubernetes.io/service-account.name: {{ include "ks-core.serviceAccountName" . }}
+  {{- end }}
+type: kubernetes.io/service-account-token
+{{- end }}
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

src/test/ks-core/templates/webhook.yaml

@@ -54,6 +54,45 @@ webhooks:
     sideEffects: None
     timeoutSeconds: 30
 
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: defaulter.installplan.kubesphere.io
+webhooks:
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      caBundle: {{ b64enc $ca.Cert | quote }}
+      service:
+        name: ks-controller-manager
+        namespace: kubesphere-system
+        path: /mutate-kubesphere-io-v1alpha1-installplan
+        port: 443
+    failurePolicy: Fail
+    matchPolicy: Exact
+    name: installplans.kubesphere.io
+    namespaceSelector: {}
+    objectSelector:
+      matchExpressions:
+        - key: app.kubernetes.io/managed-by
+          operator: NotIn
+          values:
+            - Helm
+    rules:
+      - apiGroups:
+          - kubesphere.io
+        apiVersions:
+          - 'v1alpha1'
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - installplans
+        scope: '*'
+    sideEffects: None
+    timeoutSeconds: 30
+
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration

src/test/ks-core/values.yaml

@@ -241,7 +241,7 @@ agent:
 
 helmExecutor:
   timeout: 5m
-  historyMax: 5
+  historyMax: 2
   image:
     registry: ""
     repository: kubesphereio/kubectl