test main

Signed-off-by: Matteo Mortari <[email protected]> adapt main in tarilabs/mr to odh for quay Signed-off-by: Matteo Mortari <[email protected]> adapt main in tarilabs/mr to odh for quay Signed-off-by: Matteo Mortari <[email protected]> adapt main in tarilabs/mr to odh for quay Signed-off-by: Matteo Mortari <[email protected]> adapt main in tarilabs/mr to odh for quay Signed-off-by: Matteo Mortari <[email protected]> adapt main in tarilabs/mr to odh for quay Signed-off-by: Matteo Mortari <[email protected]> adapt main in tarilabs/mr to odh for quay Signed-off-by: Matteo Mortari <[email protected]>
tarilabs · Sep 26, 2024 · 3d76559 · 3d76559
1 parent 3761a6a
commit 3d76559
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
@@ -14,7 +14,7 @@ on:
       - '.github/dependabot.yml'
       - 'docs/**'
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: mmortari
   IMG_REPO: model-registry
   DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -50,7 +50,7 @@ jobs:
         if: env.BUILD_CONTEXT == 'main'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: quay.io/${{ 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 +60,7 @@ jobs:
         if: env.BUILD_CONTEXT == 'main'
         shell: bash
         env:
-          IMG: ${{ env.IMG_ORG }}/${{ env.IMG_REPO }}
+          IMG: quay.io/${{ 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
@@ -11,7 +11,7 @@ on:
       - "docs/**"
       - "clients/python/docs/**"
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: mmortari
   IMG_REPO: model-registry
   PUSH_IMAGE: false
   BRANCH: ${{ github.base_ref }}
@@ -38,12 +38,12 @@ jobs:
           node_image: "kindest/node:v1.27.11"
       - name: Load Local Registry Test Image
         env:
-          IMG: "${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"
+          IMG: quay.io/"${{ 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_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"
+          IMG: quay.io/"${{ env.IMG_ORG }}/${{ env.IMG_REPO }}:${{ steps.tags.outputs.tag }}"
         run: |
           echo "Download kustomize 5.2.1"
           mkdir $GITHUB_WORKSPACE/kustomize

diff --git a/.github/workflows/csi-build-and-push-image.yml b/.github/workflows/csi-build-and-push-image.yml
@@ -14,7 +14,7 @@ on:
       - '.github/dependabot.yml'
       - 'docs/**'
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: mmortari
   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
diff --git a/.github/workflows/csi-test.yml b/.github/workflows/csi-test.yml
@@ -20,7 +20,7 @@ on:
       - "go.mod"
 
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: mmortari
   MODEL_REGISTRY_IMG: model-registry
   MODEL_REGISTRY_CSI_IMG: model-registry-storage-initializer
   PUSH_IMAGE: false
@@ -70,7 +70,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
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ DOCKER ?= docker
 # default Dockerfile
 DOCKERFILE ?= Dockerfile
 # container registry, default to empty (dockerhub) if not explicitly set
-IMG_REGISTRY ?= 
+IMG_REGISTRY ?= quay.io
 # container image organization
 IMG_ORG ?= kubeflow
 # container image version

diff --git a/csi/Makefile b/csi/Makefile
@@ -12,7 +12,7 @@ DOCKER ?= docker
 DOCKERFILE ?= Dockerfile
 DOCKERFILE_DEV ?= Dockerfile.dev
 
-IMG_REGISTRY ?= 
+IMG_REGISTRY ?= quay.io
 # container image organization
 IMG_ORG ?= kubeflow
 # container image version

diff --git a/scripts/build_deploy.sh b/scripts/build_deploy.sh
@@ -3,7 +3,7 @@
 set -e
 
 # see Makefile for the IMG_ variables semantic
-IMG_REGISTRY=""
+IMG_REGISTRY="quay.io"
 IMG_ORG="${IMG_ORG:-kubeflow}"
 IMG_REPO="${IMG_REPO:-model-registry}"
 DOCKER_USER="${DOCKER_USER}"