From 53b1ca3ffcd8be35787f312a8e85825c39a4246a Mon Sep 17 00:00:00 2001
From: King'ori Maina <j@kingori.co>
Date: Wed, 16 Oct 2024 19:43:38 +0200
Subject: [PATCH] Move helm-release/release job to release workflow

---
 .github/workflows/helm-release.yml | 35 ------------------------------
 .github/workflows/release.yml      | 24 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 35 deletions(-)
 delete mode 100644 .github/workflows/helm-release.yml

diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
deleted file mode 100644
index 2586449..0000000
--- a/.github/workflows/helm-release.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Release Charts
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  release:
-    # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
-    # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        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: Set up Helm
-        uses: azure/setup-helm@v4.2.0
-        with:
-          version: v3.14.4
-
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.6.0
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          CR_RELEASE_NAME_TEMPLATE: "{{ .Name }}-chart-{{ .Version }}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8d430aa..70ecb39 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,3 +60,27 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
           repository: ${{ env.IMAGE }}
+
+  helm-release:
+    runs-on: ubuntu-latest
+    needs: github-release
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        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: Set up Helm
+        uses: azure/setup-helm@v4.2.0
+        with:
+          version: v3.14.4
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.6.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_RELEASE_NAME_TEMPLATE: "{{ .Name }}-chart-{{ .Version }}"