fix appVersion to v1.5.0 and sync charts to openyurtio/charts (#2104)

openyurtio · Jul 25, 2024 · e24a7e1 · e24a7e1
1 parent 07266e0
commit e24a7e1
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 40 deletions.
diff --git a/.github/workflows/sync-charts.yaml b/.github/workflows/sync-charts.yaml
@@ -18,14 +18,12 @@ jobs:
       - name: Get the version
         id: get_version
         run: |
-          echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
-          echo ::set-output name=TAG::${GITHUB_REF#refs/tags/}
+          echo "CHART_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
-      - name: Sync to openyurt-helm Repo
+      - name: Sync to openyurtio/charts Repo
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SYNC_CHARTS_SECRET }}
-          VERSION: ${{ steps.get_version.outputs.VERSION }}
-          TAG: ${{ steps.get_version.outputs.TAG }}
+          VERSION: ${{ steps.get_version.outputs.CHART_VERSION }}
           COMMIT_ID: ${{ github.sha }}
         run: |
           bash ./hack/lib/sync-charts.sh
diff --git a/charts/yurt-coordinator/Chart.yaml b/charts/yurt-coordinator/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.5.0
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "1.5.0"
+appVersion: "v1.5.0"
diff --git a/charts/yurt-iot-dock/Chart.yaml b/charts/yurt-iot-dock/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.5.0
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "1.5.0"
+appVersion: "v1.5.0"
diff --git a/charts/yurt-manager/Chart.yaml b/charts/yurt-manager/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.5.0
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "1.5.0"
+appVersion: "v1.5.0"
diff --git a/charts/yurt-manager/templates/yurt-manager.yaml b/charts/yurt-manager/templates/yurt-manager.yaml
@@ -116,7 +116,7 @@ spec:
             {{- end }}
           command:
             - /usr/local/bin/yurt-manager
-          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: IfNotPresent
           name: yurt-manager
           ports:

diff --git a/charts/yurt-manager/values.yaml b/charts/yurt-manager/values.yaml
@@ -13,7 +13,7 @@ nameOverride: ""
 image:
   registry: openyurt
   repository: yurt-manager
-  tag: v1.4.0
+  tag: ""
   pullSecrets: []
   # pullSecrets:
   #   - name: myRegistryKeySecretName

diff --git a/charts/yurthub/Chart.yaml b/charts/yurthub/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.5.0
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "1.5.0"
+appVersion: "v1.5.0"
diff --git a/charts/yurthub/templates/yurthub-cloud-yurtstaticset.yaml b/charts/yurthub/templates/yurthub-cloud-yurtstaticset.yaml
@@ -23,7 +23,7 @@ spec:
             type: Directory
       containers:
         - name: yurt-hub
-          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: hub-dir

diff --git a/charts/yurthub/templates/yurthub-yurtstaticset.yaml b/charts/yurthub/templates/yurthub-yurtstaticset.yaml
@@ -23,7 +23,7 @@ spec:
             type: Directory
       containers:
         - name: yurt-hub
-          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: hub-dir

diff --git a/charts/yurthub/values.yaml b/charts/yurthub/values.yaml
@@ -14,4 +14,4 @@ organizations: ""
 image:
   registry: openyurt
   repository: yurthub
-  tag: v1.4.0
+  tag: ""
diff --git a/hack/lib/sync-charts.sh b/hack/lib/sync-charts.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -l
-# Copyright 2020 The OpenYurt Authors.
+# Copyright 2024 The OpenYurt Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,59 +26,59 @@ echo "git clone"
 cd ..
 git config --global user.email "[email protected]"
 git config --global user.name "openyurt-bot"
-git clone --single-branch --depth 1 [email protected]:openyurtio/openyurt-helm.git openyurt-helm
+git clone --single-branch --depth 1 [email protected]:openyurtio/charts.git charts
 
-echo "clear openyurt-helm charts/yurt-coordinator"
+echo "clear charts/yurt-coordinator in openyurtio/charts"
 
-if [ -d "openyurt-helm/charts/yurt-coordinator" ]
+if [ -d "charts/charts/yurt-coordinator" ]
 then
     echo "charts yurt-coordinator exists, remove it"
-    rm -r openyurt-helm/charts/yurt-coordinator/*
+    rm -r charts/charts/yurt-coordinator/*
 else
-    mkdir -p openyurt-helm/charts/yurt-coordinator
+    mkdir -p charts/charts/yurt-coordinator
 fi
 
-echo "clear openyurt-helm charts/yurt-manager"
+echo "clear charts/yurt-manager in openyurtio/charts"
 
-if [ -d "openyurt-helm/charts/yurt-manager" ]
+if [ -d "charts/charts/yurt-manager" ]
 then
     echo "charts yurt-manager exists, remove it"
-    rm -r openyurt-helm/charts/yurt-manager/*
+    rm -r charts/charts/yurt-manager/*
 else
-    mkdir -p openyurt-helm/charts/yurt-manager
+    mkdir -p charts/charts/yurt-manager
 fi
 
-echo "clear openyurt-helm charts/yurthub"
+echo "clear charts/yurthub in openyurtio/charts"
 
-if [ -d "openyurt-helm/charts/yurthub" ]
+if [ -d "charts/charts/yurthub" ]
 then
     echo "charts yurthub exists, remove it"
-    rm -r openyurt-helm/charts/yurthub/*
+    rm -r charts/charts/yurthub/*
 else
-    mkdir -p openyurt-helm/charts/yurthub
+    mkdir -p charts/charts/yurthub
 fi
 
-echo "clear openyurt-helm charts/yurt-iot-dock"
+echo "clear charts/yurt-iot-dock in openyurtio/charts"
 
-if [ -d "openyurt-helm/charts/yurt-iot-dock" ]
+if [ -d "charts/charts/yurt-iot-dock" ]
 then
     echo "charts yurt-iot-dock exists, remove it"
-    rm -r openyurt-helm/charts/yurt-iot-dock/*
+    rm -r charts/charts/yurt-iot-dock/*
 else
-    mkdir -p openyurt-helm/charts/yurt-iot-dock
+    mkdir -p charts/charts/yurt-iot-dock
 fi
 
-echo "copy folder openyurt/charts to openyurt-helm/charts"
+echo "copy folder openyurt/charts to openyurtio/charts/charts"
 
-cp -R openyurt/charts/yurt-coordinator/* openyurt-helm/charts/yurt-coordinator/
-cp -R openyurt/charts/yurt-manager/* openyurt-helm/charts/yurt-manager/
-cp -R openyurt/charts/yurthub/* openyurt-helm/charts/yurthub/
-cp -R openyurt/charts/yurt-iot-dock/* openyurt-helm/charts/yurt-iot-dock/
+cp -R openyurt/charts/yurt-coordinator/* charts/charts/yurt-coordinator/
+cp -R openyurt/charts/yurt-manager/* charts/charts/yurt-manager/
+cp -R openyurt/charts/yurthub/* charts/charts/yurthub/
+cp -R openyurt/charts/yurt-iot-dock/* charts/charts/yurt-iot-dock/
 
-echo "push to openyurt-helm"
-echo "version: $VERSION, commit: $COMMIT_ID, tag: $TAG"
+echo "push to openyurtio/charts"
+echo "version: $VERSION, commit: $COMMIT_ID"
 
-cd openyurt-helm
+cd charts
 
 if [ -z "$(git status --porcelain)" ]; then
   echo "nothing need to push, finished!"