From 0cf022c6ac9a9323d580ad63de78cf10494b56e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?=
 =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= <me@bjw-s.dev>
Date: Sun, 19 Feb 2023 11:54:22 +0100
Subject: [PATCH] ci: OCI release workflow changes

---
 .github/workflows/charts-release-ghpages.yaml |  3 +-
 .github/workflows/charts-release-oci.yaml     | 39 +++++++------------
 .github/workflows/charts-release.yaml         |  2 +-
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/charts-release-ghpages.yaml b/.github/workflows/charts-release-ghpages.yaml
index 33d4707f..52441ac7 100644
--- a/.github/workflows/charts-release-ghpages.yaml
+++ b/.github/workflows/charts-release-ghpages.yaml
@@ -65,8 +65,7 @@ jobs:
             mapfile -t CHART_PATH_PARTS < <(echo "$CHART" | tr '/' '\n')
             CHART_TYPE=${CHART_PATH_PARTS[0]}
 
-            helm dep up "${SRC_DIR}/${CHART}"
-            helm package "${SRC_DIR}/${CHART}" -u -d "${DEST_DIR}/${CHART_TYPE}"
+            helm package "${SRC_DIR}/${CHART}" --dependency-update --destination "${DEST_DIR}/${CHART_TYPE}"
           done
 
       - name: Update chart index
diff --git a/.github/workflows/charts-release-oci.yaml b/.github/workflows/charts-release-oci.yaml
index 42a07fbe..667acdbd 100644
--- a/.github/workflows/charts-release-oci.yaml
+++ b/.github/workflows/charts-release-oci.yaml
@@ -18,53 +18,44 @@ on:
 
 env:
   HELM_VERSION: 3.11.1
+  CHARTS_SRC_DIR: "charts"
+  TARGET_REGISTRY: ghcr.io
 
 jobs:
   release-charts:
     name: Release charts
     runs-on: ubuntu-22.04
     steps:
-      - name: Get GitHub API token
-        id: get-app-token
-        uses: getsentry/action-github-app-token@v1
-        with:
-          app_id: ${{ secrets.BJWS_APP_ID }}
-          private_key: ${{ secrets.BJWS_APP_PRIVATE_KEY }}
-
-      - name: Login to GitHub Container Registry
-        id: login-to-ghcr
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.BJWS_APP_PRIVATE_KEY }}
-
-      - name: Checkout charts branch
+      - name: Checkout chart sources
         uses: actions/checkout@v3
         with:
-          token: ${{ steps.get-app-token.outputs.token }}
-          path: "src"
           fetch-depth: 0
 
       - name: Install Kubernetes tools
-        uses: yokawasa/action-setup-kube-tools@v0.8.2
+        uses: yokawasa/action-setup-kube-tools@v0.9.2
         with:
           setup-tools: |
             helmv3
           helm: "${{ env.HELM_VERSION }}"
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.TARGET_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Package & Push Helm Charts
         shell: bash
-        env:
-          SRC_DIR: "src/charts"
         run: |
           CHARTS=( $(yq --null-input e '${{ inputs.charts }}[]' ) )
 
           for CHART in "${CHARTS[@]}" ; do
             mapfile -t CHART_PATH_PARTS < <(echo "$CHART" | tr '/' '\n')
             CHART_TYPE=${CHART_PATH_PARTS[0]}
+            CHART_NAME=${CHART_PATH_PARTS[1]}
+            CHART_VERSION=$(yq e '.version' ${{ env.CHARTS_SRC_DIR }}/${CHART}/Chart.yaml)
 
-            helm dep up "${SRC_DIR}/${CHART}"
-            helm package "${SRC_DIR}/${CHART}" -u
-            helm push ${CHART} oci://ghcr.io/${{ github.actor }}
+            helm package "${{ env.CHARTS_SRC_DIR }}/${CHART_TYPE}/${CHART_NAME}" --dependency-update --destination "${{ env.CHARTS_SRC_DIR }}/${CHART_TYPE}"
+            helm push "${{ env.CHARTS_SRC_DIR }}/${CHART_TYPE}/${CHART_NAME}-${CHART_VERSION}.tgz" oci://${{ env.TARGET_REGISTRY }}/${{ github.actor }}
           done
diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml
index df7a9af1..9e960771 100644
--- a/.github/workflows/charts-release.yaml
+++ b/.github/workflows/charts-release.yaml
@@ -61,7 +61,7 @@ jobs:
     secrets: inherit
 
   release-github-oci:
-    name: Release Application charts to GitHub pages
+    name: Release Application charts to GitHub Container Registry
     uses: ./.github/workflows/charts-release-oci.yaml
     needs:
       - prepare