From 1235c355c8143097018dcf78ef7418d82c78a45d Mon Sep 17 00:00:00 2001
From: Matteo Mortari <matteo.mortari@gmail.com>
Date: Mon, 18 Mar 2024 18:54:10 +0100
Subject: [PATCH] fix GHA syntax for dependent env

Signed-off-by: Matteo Mortari <matteo.mortari@gmail.com>
---
 .github/workflows/build-and-push-image.yml | 3 ++-
 .github/workflows/build-image-pr.yml       | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index 0ff149d98..45c5e34c9 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -16,7 +16,6 @@ on:
 env:
   IMG_ORG: kubeflow
   IMG_REPO: model-registry
-  IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
   DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
   PUSH_IMAGE: true
@@ -51,6 +50,7 @@ jobs:
         if: env.BUILD_CONTEXT == 'main'
         shell: bash
         env:
+          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
           BUILD_IMAGE: false # image is already built in "Build and Push Image" step
         run: |
           docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:latest
@@ -60,6 +60,7 @@ jobs:
         if: env.BUILD_CONTEXT == 'main'
         shell: bash
         env:
+          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
           BUILD_IMAGE: false # image is already built in "Build and Push Image" step
         run: |
           docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:main
diff --git a/.github/workflows/build-image-pr.yml b/.github/workflows/build-image-pr.yml
index edf7f20ed..ce3a8d71f 100644
--- a/.github/workflows/build-image-pr.yml
+++ b/.github/workflows/build-image-pr.yml
@@ -13,7 +13,6 @@ on:
 env:
   IMG_ORG: kubeflow
   IMG_REPO: model-registry
-  IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
   PUSH_IMAGE: false
   BRANCH: ${{ github.base_ref }}
 jobs:
@@ -37,16 +36,17 @@ jobs:
         uses: karancode/kustomize-github-action@v1.3.2
         with:
           kustomize_version: '5.2.1'
+          kustomize_build_dir: 'manifests/kustomize/overlays/db'
       - name: Start Kind Cluster
         uses: helm/kind-action@v1.9.0
       - name: Load Local Registry Test Image
         env:
-          IMG: "${{ env.IMG }}:${{ steps.tags.outputs.tag }}"
+          IMG: "${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"
         run: |
           kind load docker-image -n chart-testing ${IMG}
       - name: Create Test Registry
         env:
-          IMG: "${{ env.IMG }}:${{ steps.tags.outputs.tag }}"
+          IMG: "${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"
         run: |
           echo "Display Kustomize version"
           kustomize version