chore: adapt #98 GHA jobs to ODH midstream

- adapt GHA "env.IMG_ORG" variable
- populate csi/Makefile IMG_REGISTRY variable
- reflect csi/Makefile default for IMG_ORG
- adapt GHA csi-* steps for IMG variables,
to be analogous to
.github/workflows/build-and-push-image.yml
value of IMG variables (prefix "quay.io/")

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

Co-authored-by: Andrea Lamparelli <[email protected]>

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

@@ -14,7 +14,7 @@ on:
       - '.github/dependabot.yml'
       - 'docs/**'
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: opendatahub
   IMG_REPO: model-registry-storage-initializer
   DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -61,22 +61,22 @@ jobs:
         if: env.PUSH_IMAGE == 'true'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: quay.io/${{ 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: quay.io/${{ 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: quay.io/${{ 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/csi-test.yml

@@ -18,7 +18,7 @@ on:
       - "pkg/openapi/**"
 
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: opendatahub
   MODEL_REGISTRY_IMG: model-registry
   MODEL_REGISTRY_CSI_IMG: model-registry-storage-initializer
   PUSH_IMAGE: false
@@ -68,7 +68,7 @@ jobs:
         working-directory: ./csi
         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: "quay.io/${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_IMG }}:${{ steps.tags.outputs.tag }}"
+          MR_CSI_IMG: "quay.io/${{ env.IMG_ORG }}/${{ env.MODEL_REGISTRY_CSI_IMG }}:${{ steps.tags.outputs.tag }}"
           CLUSTER: chart-testing
         run: ./test/e2e_test.sh

csi/Makefile

@@ -12,9 +12,9 @@ DOCKER ?= docker
 DOCKERFILE ?= Dockerfile
 DOCKERFILE_DEV ?= Dockerfile.dev
 
-IMG_REGISTRY ?= 
+IMG_REGISTRY ?= quay.io
 # container image organization
-IMG_ORG ?= kubeflow
+IMG_ORG ?= opendatahub
 # container image version
 IMG_VERSION ?= main
 # container image repository