Update Chart.yaml (#6230)

config/ks-core: fix the CronJob API version determination issue

Co-authored-by: Xinzhao Xu <z2d@jifangcheng.com>

.github/workflows/build-multiarch.yaml

@@ -17,16 +17,16 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Login to Aliyun
+      - name: Login to HUAWEICLOUD
         uses: docker/login-action@v3
         with:
-          registry: registry.cn-beijing.aliyuncs.com
-          username: ${{ secrets.ALIYUNCS_USERNAME }}
-          password: ${{ secrets.ALIYUNCS_PASSWORD }}
+          registry: swr.cn-southwest-2.myhuaweicloud.com
+          username: ${{ secrets.HUAWEICLOUD_USERNAME }}
+          password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
 
       - name: Login to DOCKER
         uses: docker/login-action@v3
@@ -56,17 +56,18 @@ jobs:
         uses: docker/build-push-action@v6
         if: steps.chose_registry.outputs.env == 'prod'
         with:
+          context: ${{ github.workspace }}
           file: build/ks-apiserver/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             docker.io/kubesphere/ks-apiserver:${{ steps.chose_registry.outputs.tag }}
-            registry.cn-beijing.aliyuncs.com/kubesphereio/ks-apiserver:${{ steps.chose_registry.outputs.tag }}
 
       - name: Build and push ks-apiserver dev images
         uses: docker/build-push-action@v6
         if: steps.chose_registry.outputs.env == 'dev'
         with:
+          context: ${{ github.workspace }}
           file: build/ks-apiserver/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
@@ -77,19 +78,34 @@ jobs:
         uses: docker/build-push-action@v6
         if: steps.chose_registry.outputs.env == 'prod'
         with:
+          context: ${{ github.workspace }}
           file: build/ks-controller-manager/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             docker.io/kubesphere/ks-controller-manager:${{ steps.chose_registry.outputs.tag }}
-            registry.cn-beijing.aliyuncs.com/kubesphereio/ks-controller-manager:${{ steps.chose_registry.outputs.tag }}
+
 
       - name: Build and push ks-controller-manager dev images
         uses: docker/build-push-action@v6
         if: steps.chose_registry.outputs.env == 'dev'
         with:
+          context: ${{ github.workspace }}
           file: build/ks-controller-manager/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             docker.io/kubespheredev/ks-controller-manager:${{ steps.chose_registry.outputs.tag }}
+
+      - name: Sync ks images to HUAWEICLOUD
+        if: steps.chose_registry.outputs.env == 'prod'
+        run: |
+          # apiserver
+          docker pull docker.io/kubesphere/ks-apiserver:${{ steps.chose_registry.outputs.tag }}
+          docker tag docker.io/kubesphere/ks-apiserver:${{ steps.chose_registry.outputs.tag }} swr.cn-southwest-2.myhuaweicloud.com/ks/kubesphere/ks-apiserver:${{ steps.chose_registry.outputs.tag }}
+          docker push swr.cn-southwest-2.myhuaweicloud.com/ks/kubesphere/ks-apiserver:${{ steps.chose_registry.outputs.tag }}
+          # controller-manager
+          docker pull docker.io/kubesphere/ks-controller-manager:${{ steps.chose_registry.outputs.tag }}
+          docker tag docker.io/kubesphere/ks-controller-manager:${{ steps.chose_registry.outputs.tag }} swr.cn-southwest-2.myhuaweicloud.com/ks/kubesphere/ks-controller-manager:${{ steps.chose_registry.outputs.tag }}
+          docker push swr.cn-southwest-2.myhuaweicloud.com/ks/kubesphere/ks-controller-manager:${{ steps.chose_registry.outputs.tag }}
+          

config/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: 1.1.2
+version: 1.1.3
 
 # 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

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

@@ -86,7 +86,7 @@ spec:
   caBundle: {{ b64enc $ca.Cert }}
 
 ---
-apiVersion: {{ if semverCompare ">=1.20.0" .Capabilities.KubeVersion.Version }}batch/v1{{ else }}batch/v1beta1{{end}}
+apiVersion: {{ if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version }}batch/v1{{ else }}batch/v1beta1{{end}}
 kind: CronJob
 metadata:
   name: restart-extensions-museum