From f4de3c6ccb68ff9e1c0cbd1f17ea00b37712fd8c Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Mon, 30 Jan 2023 12:31:22 -0500
Subject: [PATCH] Fix helm packaging in release and docker push

---
 .github/workflows/release.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6a610da..bf20347 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -110,15 +110,6 @@ jobs:
         env:
           CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Tag Release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.nv.outputs.version }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-          bodyfile: release-notes.md
-          draft: false
-          prerelease: false
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -136,8 +127,8 @@ jobs:
           context: docker
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:${{ steps.nv.outputs.appVersion }}
-            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ github.repository }}/vmpooler:${{ steps.nv.outputs.appVersion }}
+            ghcr.io/${{ github.repository }}/vmpooler:latest
 
       - uses: azure/setup-helm@v3
 
@@ -148,6 +139,7 @@ jobs:
       - name: Package Helm charts
         run: |
           set -e
+          helm dependency update helm-charts/vmpooler
           cd docs/
           helm package ../helm-charts/*
           helm repo index --url https://puppetlabs.github.io/vmpooler-deployment/ .
@@ -159,3 +151,12 @@ jobs:
           git add docs
           git commit -m "release helm-chart version ${{ steps.nv.outputs.version }}"
           git push
+
+      - name: Tag Release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.nv.outputs.version }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          bodyfile: release-notes.md
+          draft: false
+          prerelease: false