ci: followup to kubeflow#872 sync default branch GH action

some GitHub Actions are failing on `main` default branch
because of a couple of missing updates

Signed-off-by: Matteo Mortari <[email protected]>

Author: tarilabs

.github/workflows/build-and-push-csi-image.yml

@@ -14,6 +14,7 @@ on:
       - '.github/dependabot.yml'
       - 'docs/**'
 env:
+  IMG_REGISTRY: ghcr.io
   IMG_ORG: kubeflow
   IMG_REPO: model-registry-storage-initializer
   PUSH_IMAGE: true
@@ -60,22 +61,22 @@ jobs:
         if: env.PUSH_IMAGE == 'true'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: "${{ env.IMG_REGISTRY }}/${{ env.IMG_ORG }}/${{ env.IMG_REPO }}"
         run: IMG=${{ env.IMG }} IMG_VERSION=${{ env.VERSION }} make image/push
       # Tag latest and main
       - name: Tag Latest
         if: env.BUILD_CONTEXT == 'main' && env.PUSH_IMAGE == 'true'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: "${{ env.IMG_REGISTRY }}/${{ env.IMG_ORG }}/${{ env.IMG_REPO }}"
         run: |
           docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:latest
           IMG=${{ env.IMG }} IMG_VERSION=latest make image/push
       - name: Tag Main
         if: env.BUILD_CONTEXT == 'main' && env.PUSH_IMAGE == 'true'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: "${{ env.IMG_REGISTRY }}/${{ env.IMG_ORG }}/${{ env.IMG_REPO }}"
         run: |
           docker tag ${{ env.IMG }}:$VERSION ${{ env.IMG }}:main
           IMG=${{ env.IMG }} IMG_VERSION=main make image/push

.github/workflows/build-and-push-image.yml

@@ -14,6 +14,7 @@ on:
       - '.github/dependabot.yml'
       - 'docs/**'
 env:
+  IMG_REGISTRY: ghcr.io
   IMG_ORG: kubeflow
   IMG_REPO: model-registry
   PUSH_IMAGE: true
@@ -50,7 +51,7 @@ jobs:
         if: env.BUILD_CONTEXT == 'main'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: "${{ env.IMG_REGISTRY }}/${{ 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,7 +61,7 @@ jobs:
         if: env.BUILD_CONTEXT == 'main'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: "${{ env.IMG_REGISTRY }}/${{ 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

.github/workflows/csi-test.yml

@@ -21,6 +21,7 @@ on:
       - "go.mod"
 
 env:
+  IMG_REGISTRY: ghcr.io
   IMG_ORG: kubeflow
   MODEL_REGISTRY_IMG: model-registry
   MODEL_REGISTRY_CSI_IMG: model-registry-storage-initializer
@@ -75,7 +76,7 @@ jobs:
       - name: Run tests
         shell: bash
         env:
-          MR_IMG: "${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_IMG }}:${{ steps.tags.outputs.tag }}"
-          MR_CSI_IMG: "${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_CSI_IMG }}:${{ steps.tags.outputs.tag }}"
+          MR_IMG: "${{ env.IMG_REGISTRY }}/${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_IMG }}:${{ steps.tags.outputs.tag }}"
+          MR_CSI_IMG: "${{ env.IMG_REGISTRY }}/${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_CSI_IMG }}:${{ steps.tags.outputs.tag }}"
           CLUSTER: chart-testing
         run: ./test/csi/e2e_test.sh

test/scripts/install_modelregistry.sh

@@ -18,7 +18,7 @@ Help() {
 MR_ROOT="$(dirname "$0")/../.."
 
 namespace=kubeflow
-image=kubeflow/model-registry:latest
+image=ghcr.io/kubeflow/model-registry:latest
 while getopts ":hn:i:" option; do
    case $option in
       h) # display Help
@@ -40,7 +40,7 @@ if ! kubectl get namespace "$namespace" &> /dev/null; then
 fi
 # Apply model-registry kustomize manifests
 echo Using model registry image: $image
-cd $MR_ROOT/manifests/kustomize/base && kustomize edit set image kubeflow/model-registry:latest=${image} && \
+cd $MR_ROOT/manifests/kustomize/base && kustomize edit set image ghcr.io/kubeflow/model-registry:latest=${image} && \
 kustomize edit set namespace $namespace && cd -
 cd $MR_ROOT/manifests/kustomize/overlays/db && kustomize edit set namespace $namespace && cd -
 kubectl -n $namespace apply -k "$MR_ROOT/manifests/kustomize/overlays/db"