From 42397d095e183062fd36d9caec4c2c839a5063bb Mon Sep 17 00:00:00 2001 From: wangxye Date: Wed, 15 Nov 2023 19:17:14 +0800 Subject: [PATCH 1/2] chore(ci): support chart release in action Signed-off-by: wangxye --- .github/workflows/release.yml | 32 +++++++++++++++++++ .../automq-for-rocketmq}/Chart.yaml | 0 .../templates/broker/NOTES.txt | 0 .../templates/broker/_brokerconfig.tpl | 0 .../templates/broker/_helpers.tpl | 0 .../templates/broker/configmap.yaml | 0 .../templates/broker/service.yaml | 0 .../templates/broker/statefulset.yaml | 0 .../automq-for-rocketmq}/values.yaml | 0 distribution/helm/deploy-ci.sh | 2 +- 10 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/release.yml rename distribution/helm/{ => charts/automq-for-rocketmq}/Chart.yaml (100%) rename distribution/helm/{ => charts/automq-for-rocketmq}/templates/broker/NOTES.txt (100%) rename distribution/helm/{ => charts/automq-for-rocketmq}/templates/broker/_brokerconfig.tpl (100%) rename distribution/helm/{ => charts/automq-for-rocketmq}/templates/broker/_helpers.tpl (100%) rename distribution/helm/{ => charts/automq-for-rocketmq}/templates/broker/configmap.yaml (100%) rename distribution/helm/{ => charts/automq-for-rocketmq}/templates/broker/service.yaml (100%) rename distribution/helm/{ => charts/automq-for-rocketmq}/templates/broker/statefulset.yaml (100%) rename distribution/helm/{ => charts/automq-for-rocketmq}/values.yaml (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..c368bcb7d --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,32 @@ +name: Release Charts + +on: + push: + branches: + - main + +jobs: + release: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Install Helm + uses: azure/setup-helm@v3 + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.6.0 + with: + charts_dir: distribution/helm/charts + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/distribution/helm/Chart.yaml b/distribution/helm/charts/automq-for-rocketmq/Chart.yaml similarity index 100% rename from distribution/helm/Chart.yaml rename to distribution/helm/charts/automq-for-rocketmq/Chart.yaml diff --git a/distribution/helm/templates/broker/NOTES.txt b/distribution/helm/charts/automq-for-rocketmq/templates/broker/NOTES.txt similarity index 100% rename from distribution/helm/templates/broker/NOTES.txt rename to distribution/helm/charts/automq-for-rocketmq/templates/broker/NOTES.txt diff --git a/distribution/helm/templates/broker/_brokerconfig.tpl b/distribution/helm/charts/automq-for-rocketmq/templates/broker/_brokerconfig.tpl similarity index 100% rename from distribution/helm/templates/broker/_brokerconfig.tpl rename to distribution/helm/charts/automq-for-rocketmq/templates/broker/_brokerconfig.tpl diff --git a/distribution/helm/templates/broker/_helpers.tpl b/distribution/helm/charts/automq-for-rocketmq/templates/broker/_helpers.tpl similarity index 100% rename from distribution/helm/templates/broker/_helpers.tpl rename to distribution/helm/charts/automq-for-rocketmq/templates/broker/_helpers.tpl diff --git a/distribution/helm/templates/broker/configmap.yaml b/distribution/helm/charts/automq-for-rocketmq/templates/broker/configmap.yaml similarity index 100% rename from distribution/helm/templates/broker/configmap.yaml rename to distribution/helm/charts/automq-for-rocketmq/templates/broker/configmap.yaml diff --git a/distribution/helm/templates/broker/service.yaml b/distribution/helm/charts/automq-for-rocketmq/templates/broker/service.yaml similarity index 100% rename from distribution/helm/templates/broker/service.yaml rename to distribution/helm/charts/automq-for-rocketmq/templates/broker/service.yaml diff --git a/distribution/helm/templates/broker/statefulset.yaml b/distribution/helm/charts/automq-for-rocketmq/templates/broker/statefulset.yaml similarity index 100% rename from distribution/helm/templates/broker/statefulset.yaml rename to distribution/helm/charts/automq-for-rocketmq/templates/broker/statefulset.yaml diff --git a/distribution/helm/values.yaml b/distribution/helm/charts/automq-for-rocketmq/values.yaml similarity index 100% rename from distribution/helm/values.yaml rename to distribution/helm/charts/automq-for-rocketmq/values.yaml diff --git a/distribution/helm/deploy-ci.sh b/distribution/helm/deploy-ci.sh index 028d1a649..74a5345e2 100644 --- a/distribution/helm/deploy-ci.sh +++ b/distribution/helm/deploy-ci.sh @@ -68,6 +68,6 @@ helm install mysql bitnami/mysql -f deploy/mysql.yaml --namespace $NAMESPACE kubectl rollout status --watch --timeout=120s statefulset/mysql --namespace $NAMESPACE # deploy automq-for-rocketmq -helm install automq-for-rocketmq . -f deploy/helm_sample_values.yaml --set broker.image.repository=$ROCKETMQ_REPO --set broker.image.tag=$ROCKETMQ_VERSION --namespace $NAMESPACE +helm install automq-for-rocketmq ./charts/automq-for-rocketmq -f deploy/helm_sample_values.yaml --set broker.image.repository=$ROCKETMQ_REPO --set broker.image.tag=$ROCKETMQ_VERSION --namespace $NAMESPACE kubectl rollout status --watch --timeout=360s statefulset/automq-for-rocketmq-broker --namespace $NAMESPACE \ No newline at end of file From f43af461e104e4c99813395442babbdc97f24806 Mon Sep 17 00:00:00 2001 From: wangxye Date: Wed, 15 Nov 2023 19:24:06 +0800 Subject: [PATCH 2/2] chore: update helm chart description Signed-off-by: wangxye --- distribution/helm/charts/automq-for-rocketmq/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distribution/helm/charts/automq-for-rocketmq/Chart.yaml b/distribution/helm/charts/automq-for-rocketmq/Chart.yaml index 39e052b78..f93846de7 100644 --- a/distribution/helm/charts/automq-for-rocketmq/Chart.yaml +++ b/distribution/helm/charts/automq-for-rocketmq/Chart.yaml @@ -15,8 +15,8 @@ apiVersion: v2 -name: rocketmq-k8s-helm -description: A Helm chart for Kubernetes +name: automq-for-rocketmq +description: A Helm chart for automq-for-rocketmq # A chart can be either an 'application' or a 'library' chart. #