adapt CI and script values from upstream KF to ODH midstream

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

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

@@ -14,10 +14,10 @@ on:
       - '.github/dependabot.yml'
       - 'docs/**'
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: opendatahub
   IMG_REPO: model-registry
-  DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
-  DOCKER_PWD: ${{ secrets.DOCKERHUB_TOKEN }}
+  DOCKER_USER: ${{ secrets.QUAY_USERNAME }}
+  DOCKER_PWD: ${{ secrets.QUAY_PASSWORD }}
   PUSH_IMAGE: true
 jobs:
   build-image:
@@ -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

.github/workflows/build-image-pr.yml

@@ -11,7 +11,7 @@ on:
       - 'docs/**'
       - 'clients/python/**'
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: opendatahub
   IMG_REPO: model-registry
   PUSH_IMAGE: false
   BRANCH: ${{ github.base_ref }}
@@ -36,12 +36,12 @@ jobs:
         uses: helm/[email protected]
       - 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: Deploy Operator With 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: |
           echo "Deploying operator from model-registry-operator branch ${BRANCH}"
           kubectl apply -k "https://github.com/opendatahub-io/model-registry-operator.git/config/default?ref=${BRANCH}"

Makefile

@@ -13,9 +13,9 @@ 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
+IMG_ORG ?= opendatahub
 # container image version
 IMG_VERSION ?= main
 # container image repository

manifests/kustomize/base/model-registry-deployment.yaml

@@ -24,7 +24,7 @@ spec:
           command:
             - /model-registry
             - proxy
-          image: kubeflow/model-registry:latest
+          image: quay.io/opendatahub/model-registry:latest
           # empty placeholder environment for patching
           env: []
           ports:

scripts/build_deploy.sh

@@ -3,8 +3,8 @@
 set -e
 
 # see Makefile for the IMG_ variables semantic
-IMG_REGISTRY=""
-IMG_ORG="${IMG_ORG:-kubeflow}"
+IMG_REGISTRY="quay.io"
+IMG_ORG="${IMG_ORG:-opendatahub}"
 IMG_REPO="${IMG_REPO:-model-registry}"
 DOCKER_USER="${DOCKER_USER}"
 DOCKER_PWD="${DOCKER_PWD}"