fix: add PersistentVolumeClaim definition to prepare upgrade job (#6483)

Signed-off-by: hongming <coder.scala@gmail.com>

config/ks-core/Chart.yaml

@@ -7,12 +7,12 @@ 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: 1.1.4-rc.0
+version: 1.1.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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "v4.1.3-rc.0"
+appVersion: "v4.1.3"
 
 dependencies:
   - name: redis-ha

config/ks-core/templates/extension-museum.yaml

@@ -83,4 +83,6 @@ metadata:
 spec:
   url: https://extensions-museum.{{ .Release.Namespace }}.svc
   caBundle: {{ b64enc $ca.Cert }}
+status:
+  lastSyncTime: null
 {{end}}

config/ks-core/templates/pre-upgrade-job.yaml

@@ -12,27 +12,6 @@ data:
     {{- toYaml .Values.upgrade.config | nindent 4 }}
 {{- end }}
 
----
-{{- if not (lookup "v1" "PersistentVolumeClaim" .Release.Namespace .Values.upgrade.persistenceVolume.name) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ .Values.upgrade.persistenceVolume.name }}
-  annotations:
-    "helm.sh/hook": pre-upgrade
-    "helm.sh/hook-weight": "-1"
-  labels:
-    app: ks-upgrade
-    version: {{ .Chart.AppVersion }}
-spec:
-  accessModes:
-    - {{ .Values.upgrade.persistenceVolume.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.upgrade.persistenceVolume.size | quote }}
-  storageClassName: {{ .Values.upgrade.persistenceVolume.storageClassName }}
-{{-  end }}
-
 ---
 apiVersion: batch/v1
 kind: Job

config/ks-core/templates/prepare-upgrade-job.yaml

@@ -10,6 +10,27 @@ data:
     {{- toYaml .Values.upgrade.config | nindent 4 }}
 {{- end }}
 
+{{- if not (lookup "v1" "PersistentVolumeClaim" .Release.Namespace .Values.upgrade.persistenceVolume.name) }}
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ .Values.upgrade.persistenceVolume.name }}
+  annotations:
+    "helm.sh/hook": pre-upgrade
+    "helm.sh/hook-weight": "-1"
+  labels:
+    app: ks-upgrade
+    version: {{ .Chart.AppVersion }}
+spec:
+  accessModes:
+    - {{ .Values.upgrade.persistenceVolume.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.upgrade.persistenceVolume.size | quote }}
+  storageClassName: {{ .Values.upgrade.persistenceVolume.storageClassName }}
+{{-  end }}
+
 ---
 apiVersion: batch/v1
 kind: Job
@@ -40,6 +61,8 @@ spec:
             - mountPath: /etc/kubesphere/config-patch.yaml
               name: config
               subPath: config-patch.yaml
+            - mountPath: /tmp/ks-upgrade
+              name: data
           {{- end }}
       {{- if .Values.upgrade.config }}
       volumes:
@@ -47,6 +70,9 @@ spec:
           configMap:
             name: ks-upgrade-prepare-config
             defaultMode: 420
+        - name: data
+          persistentVolumeClaim:
+            claimName: {{ .Values.upgrade.persistenceVolume.name }}
       {{- end }}
 {{- end }}
 {{- end }}

config/ks-core/values.yaml

@@ -2,7 +2,7 @@
 ## @param global.tag Global Docker image tag
 global:
   imageRegistry: docker.io
-  tag: v4.1.3-rc.0
+  tag: v4.1.3
   imagePullSecrets: []
   # - name: "image-pull-secret"
 
@@ -443,5 +443,5 @@ ksExtensionRepository:
   image:
     registry: ""
     repository: kubesphere/ks-extensions-museum
-    tag: "1.1.3-rc.0"
+    tag: "v1.1.5"
     pullPolicy: IfNotPresent