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

Update ks-core helm chart
kubesphere · Apr 1, 2024 · a9612b6 · a9612b6
2 parents 47ab858 + d643ea7
commit a9612b6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 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.20
+version: 0.6.21
 
 # 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/post-upgrade-job.yaml b/src/test/ks-core/templates/post-upgrade-job.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.upgrade.disabled }}
+{{- if .Values.upgrade.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:

diff --git a/src/test/ks-core/templates/pre-upgrade-job.yaml b/src/test/ks-core/templates/pre-upgrade-job.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.upgrade.disabled }}
+{{- if .Values.upgrade.enabled }}
 {{- if .Values.upgrade.config }}
 apiVersion: v1
 kind: ConfigMap

diff --git a/src/test/ks-core/templates/prepare-upgrade-job.yaml b/src/test/ks-core/templates/prepare-upgrade-job.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.upgrade.enabled }}
 {{- if .Values.upgrade.prepare }}
 {{- if .Values.upgrade.config }}
 apiVersion: v1
@@ -47,4 +48,5 @@ spec:
             name: ks-upgrade-prepare-config
             defaultMode: 420
       {{- end }}
+{{- end }}
 {{- end }}
diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml
@@ -241,6 +241,7 @@ agent:
 
 helmExecutor:
   timeout: 5m
+  historyMax: 5
   image:
     registry: ""
     repository: kubesphereio/kubectl
@@ -315,7 +316,7 @@ hook:
       memory: 100Mi
 
 upgrade:
-  disabled: false
+  enabled: true
   image:
     registry: ""
     repository: kse/ks-upgrade