add Kustomize 5.2.1 in Kind GHA testing (#43)

* add Kustomize 5.2.1 in Kind GHA testing Signed-off-by: Matteo Mortari <[email protected]> * fix GHA syntax for dependent env Signed-off-by: Matteo Mortari <[email protected]> * use kustomize install binary instead of dedicated GHA step Signed-off-by: Matteo Mortari <[email protected]> * kustomize seems installed by default in GHA Signed-off-by: Matteo Mortari <[email protected]> --------- Signed-off-by: Matteo Mortari <[email protected]>
kubeflow · Mar 25, 2024 · 784c9fb · 784c9fb
1 parent 1ef7b3c
commit 784c9fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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,18 +36,24 @@ jobs:
         uses: helm/[email protected]
       - 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 "Download kustomize 5.2.1"
+          mkdir $GITHUB_WORKSPACE/kustomize
+          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash -s "5.2.1" "$GITHUB_WORKSPACE/kustomize"
+          PATH=$GITHUB_WORKSPACE/kustomize:$PATH
+          echo "Display Kustomize version"
+          kustomize version 
           echo "Deploying Model Registry using Manifests; branch ${BRANCH}"
           kubectl create namespace kubeflow
           cd manifests/kustomize/overlays/db
           kustomize edit set image kubeflow/model-registry:latest $IMG
-          kubectl apply -k .
+          kustomize build | kubectl apply -f -
       - name: Wait for Test Registry Deployment
         run: |
           kubectl wait --for=condition=available -n kubeflow deployment/model-registry-db --timeout=5m