From c126f140467395635f0951c447e006335c777a66 Mon Sep 17 00:00:00 2001
From: Tyler Gillson <tyler.gillson@gmail.com>
Date: Fri, 4 Jul 2025 08:12:43 -0600
Subject: [PATCH 1/3] ci: handle chart deps during packaging

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
---
 .github/workflows/release.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index faace473..4a110d2a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -80,6 +80,15 @@ jobs:
           set -e
           mkdir -p release
           pushd release
+          yq eval '.dependencies[] | .name + " " + .repository' ../${{ matrix.repository }}/charts/${{ matrix.repository }}/Chart.yaml | while read -r repo_name repo_url; do
+            if [[ ! "$repo_url" =~ ^(oci://|file://) ]]; then
+              helm repo add "$repo_name" "$repo_url"
+            else
+              echo "Skipping OCI repository $repo_url for $repo_name"
+            fi
+          done
+          helm repo update
+          helm dependency build ../${{ matrix.repository }}/charts/${{ matrix.repository }}
           helm package ../${{ matrix.repository }}/charts/${{ matrix.repository }} \
             --app-version ${{ needs.env.outputs.RELEASE_VERSION }} \
             --version ${{ needs.env.outputs.TRIMMED_RELEASE_VERSION }}

From 7c7d21b181ba8e4fa85244fa272d4eae43621416 Mon Sep 17 00:00:00 2001
From: Tyler Gillson <tyler.gillson@gmail.com>
Date: Fri, 4 Jul 2025 08:23:27 -0600
Subject: [PATCH 2/3] ci: fix work dirs in release image workflow

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
---
 .github/workflows/releaseimage.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/releaseimage.yml b/.github/workflows/releaseimage.yml
index ac9be7cc..97100e7d 100644
--- a/.github/workflows/releaseimage.yml
+++ b/.github/workflows/releaseimage.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
-          path: go/src/open-cluster-management.io/lab/${{ matrix.repository }}
+          path: go/src/open-cluster-management.io/lab
 
       - name: install Go
         uses: actions/setup-go@v5
@@ -69,6 +69,7 @@ jobs:
       - name: images
         run: |
           set -e
+          cd ${{ matrix.repository }}
           IMAGE_TAG=${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }} \
           IMAGE_BUILD_EXTRA_FLAGS="--build-arg OS=linux --build-arg ARCH=${{ matrix.arch }}" \
             make images
@@ -76,6 +77,7 @@ jobs:
       - name: push
         run: |
           set -e
+          cd ${{ matrix.repository }}
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login quay.io --username ${{ secrets.DOCKER_USER }} --password-stdin
           IMAGE_TAG=${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }} \
             make image-push
@@ -92,17 +94,19 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
-          path: go/src/open-cluster-management.io/lab/${{ matrix.repository }}
+          path: go/src/open-cluster-management.io/lab
 
       - name: create
         run: |
           set -e
+          cd ${{ matrix.repository }}
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login quay.io --username ${{ secrets.DOCKER_USER }} --password-stdin
           IMAGE_TAG=${{ needs.env.outputs.RELEASE_VERSION }} make image-manifest
 
       - name: annotate
         run: |
           set -e
+          cd ${{ matrix.repository }}
           IMAGE_TAG=${{ needs.env.outputs.RELEASE_VERSION }} make image-manifest-annotate
 
       - name: push

From c6d31cd4075f593b6e905c528119bb6d02b33770 Mon Sep 17 00:00:00 2001
From: Tyler Gillson <tyler.gillson@gmail.com>
Date: Fri, 4 Jul 2025 08:25:29 -0600
Subject: [PATCH 3/3] chore: wording

Signed-off-by: Tyler Gillson <tyler.gillson@gmail.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4a110d2a..6b6b796f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,7 +84,7 @@ jobs:
             if [[ ! "$repo_url" =~ ^(oci://|file://) ]]; then
               helm repo add "$repo_name" "$repo_url"
             else
-              echo "Skipping OCI repository $repo_url for $repo_name"
+              echo "Skipping repository $repo_url for $repo_name"
             fi
           done
           helm repo update