Ubi docker file change

.github/pull.yml

@@ -0,0 +1,5 @@
+version: "1"
+rules:
+  - base: main
+    upstream: kubeflow:main
+label: "tide/merge-method-merge"

.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/docs/**"
 env:
-  IMG_ORG: kubeflow
+  IMG_ORG: opendatahub
   IMG_REPO: model-registry
   PUSH_IMAGE: false
   BRANCH: ${{ github.base_ref }}
@@ -38,29 +38,23 @@ 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
+      - 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}"
+          kubectl set env -n model-registry-operator-system deployment/model-registry-operator-controller-manager REST_IMAGE="${IMG}"
+      - name: Create Test Registry
         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
-          kustomize build | kubectl apply -f -
+          kubectl apply -k "https://github.com/opendatahub-io/model-registry-operator.git/config/samples/postgres?ref=${BRANCH}"
+          kubectl get mr
       - name: Wait for Test Registry Deployment
         run: |
-          kubectl wait --for=condition=available -n kubeflow deployment/model-registry-db --timeout=5m
-          kubectl wait --for=condition=available -n kubeflow deployment/model-registry-deployment --timeout=5m
-          kubectl logs -n kubeflow deployment/model-registry-deployment
+          kubectl wait --for=condition=Available=true modelregistries/modelregistry-sample --timeout=5m
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -80,6 +74,6 @@ jobs:
           pip install dist/*.whl
       - name: Connect with Python client
         run: |
-          kubectl port-forward -n kubeflow service/model-registry-service 9090:9090 &
+          kubectl port-forward service/modelregistry-sample 9090:9090 &
           sleep 5
           python test/python/test_mr_conn.py localhost 9090

.github/workflows/build.yml

@@ -50,3 +50,10 @@ jobs:
           fi
       - name: Unit tests
         run: make test-cover
+      - name: Upload coverage to Codecov
+        uses: codecov/[email protected]
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          files: coverage.txt
+          fail_ci_if_error: true

.github/workflows/python-tests.yml

@@ -60,6 +60,14 @@ jobs:
           else
             nox --python=${{ matrix.python }}
           fi
+      - name: Upload coverage report
+        uses: codecov/[email protected]
+        if: always() && matrix.session == 'tests'
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          files: coverage.xml
+          fail_ci_if_error: true
       - name: Upload documentation
         if: matrix.session == 'docs-build'
         uses: actions/upload-artifact@v4

Makefile

@@ -14,9 +14,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

OWNERS

@@ -1,9 +1,25 @@
+# DO NOT EDIT; this file is auto-generated using https://github.com/openshift/ci-tools.
+# Fetched from https://github.com/opendatahub-io/codeflare-operator root OWNERS
+# If the repo had OWNERS_ALIASES then the aliases were expanded
+# Logins who are not members of 'openshift' organization were filtered out
+# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
+
 approvers:
-  - andreyvelich
-  - ckadner
-  - tarilabs
-  - rareddy
-  - Tomcli
-  - zijianjoy
+- dhirajsb
+- isinyaaa
+- lampajr
+- nehachopra27
+- rareddy
+- rkubis
+- tarilabs
+- tonyxrmdavidson
+options: {}
 reviewers:
-  - andreyvelich
+- dhirajsb
+- isinyaaa
+- lampajr
+- nehachopra27
+- rareddy
+- rkubis
+- tarilabs
+- tonyxrmdavidson

csi/Dockerfile

@@ -23,7 +23,7 @@ RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 make build
 
 # Use distroless as minimal base image to package the model-registry storage initializer binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 WORKDIR /
 # copy the storage initializer binary
 COPY --from=builder /workspace/bin/mr-storage-initializer .

manifests/kustomize/OWNERS

@@ -1,8 +1,6 @@
 approvers:
   - tarilabs
   - rareddy
-  - Tomcli
 reviewers:
   - tarilabs
   - rareddy
-  - Tomcli

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:

openshift-ci/README.md

@@ -0,0 +1,34 @@
+# Model Registry Deployment and Deployment Test
+
+This deployment of model-registry is deployed via Opendatahub and used the ODH nightly images deployed to an openshfit cluster.
+
+The script will do the following:
+* Create a catalogue source pointing to the latest successful nightly ODH image.
+* Deploy the opendatahub operator using the catalogue source.
+* Deploy a Data Science Cluster.
+* Test the model-registry-operator-contoller-manager pods are running.
+* Clone the model-registry-operator repository.
+* Deploy model-registry using config/samples/mysql configuration files.
+* Test the model-registry-db mysql database pod is running
+* Test the modelregistry-sample pods are running
+
+## Pre-requisites:
+
+You will need to have an openshift cluster deployed and be oc logged into you cluster as admin.
+
+## Runing the script:
+
+From the root of the repository
+```
+./openshift-ci/scripts/oc-model-registry-deploy.sh
+```
+
+## Runing the openshift-ci
+
+You can start the openshift-ci job to test changes in your Pull Request. To do so put the following command into a comment in your Pull Request
+```
+/test e2e-odh-mro-optional
+```
+
+Previous jobs can be seen [here](https://prow.ci.openshift.org/job-history/gs/test-platform-results/pr-logs/directory/rehearse-49999-pull-ci-opendatahub-io-model-registry-main-e2e-odh-mro-optional)
+

openshift-ci/resources/model-registry-DSCInitialization.yaml

@@ -0,0 +1,16 @@
+apiVersion: dscinitialization.opendatahub.io/v1
+kind: DSCInitialization
+metadata:
+  creationTimestamp: '2024-03-27T16:16:55Z'
+  finalizers:
+    - dscinitialization.opendatahub.io/finalizer
+  generation: 1
+  labels:
+    app.kubernetes.io/created-by: opendatahub-operator
+    app.kubernetes.io/instance: default
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: dscinitialization
+    app.kubernetes.io/part-of: opendatahub-operator
+  name: default-dsci
+spec:
+  applicationsNamespace: opendatahub

openshift-ci/resources/model-registry-operator/modelregistry_v1alpha1_modelregistry.yaml

@@ -0,0 +1,24 @@
+apiVersion: modelregistry.opendatahub.io/v1alpha1
+kind: ModelRegistry
+metadata:
+  labels:
+    app.kubernetes.io/name: modelregistry
+    app.kubernetes.io/instance: modelregistry-sample
+    app.kubernetes.io/part-of: model-registry-operator
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: model-registry-operator
+  name: modelregistry-sample
+spec:
+  # TODO(user): Add fields here
+  grpc:
+    port: 9090
+  rest:
+    port: 8080
+    serviceRoute: enabled
+  mysql:
+    host: model-registry-db
+    database: model_registry
+    username: mlmduser
+    passwordSecret:
+      name: model-registry-db
+      key: database-password

openshift-ci/resources/model-registry-operator/mysql-db.yaml

@@ -0,0 +1,126 @@
+apiVersion: v1
+items:
+- apiVersion: v1
+  kind: Service
+  metadata:
+    annotations:
+      template.openshift.io/expose-uri: mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\mysql\)].port}
+    name: model-registry-db
+  spec:
+    ports:
+    - name: mysql
+      nodePort: 0
+      port: 3306
+      protocol: TCP
+      targetPort: 3306
+    selector:
+      name: model-registry-db
+    sessionAffinity: None
+    type: ClusterIP
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: model-registry-db
+  spec:
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: 5Gi
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    annotations:
+      template.alpha.openshift.io/wait-for-ready: "true"
+    name: model-registry-db
+  spec:
+    replicas: 1
+    revisionHistoryLimit: 0
+    selector:
+      matchLabels:
+        name: model-registry-db
+    strategy:
+      type: Recreate
+    template:
+      metadata:
+        annotations:
+          sidecar.istio.io/inject: "false"
+        labels:
+          name: model-registry-db
+      spec:
+        containers:
+        - env:
+          - name: MYSQL_USER
+            valueFrom:
+              secretKeyRef:
+                key: database-user
+                name: model-registry-db
+          - name: MYSQL_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: database-password
+                name: model-registry-db
+          - name: MYSQL_ROOT_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                key: database-password
+                name: model-registry-db
+          - name: MYSQL_DATABASE
+            valueFrom:
+              secretKeyRef:
+                key: database-name
+                name: model-registry-db
+          args:
+            - --datadir
+            - /var/lib/mysql/datadir
+            - --default-authentication-plugin=mysql_native_password
+          image: mysql:8.3.0
+          imagePullPolicy: IfNotPresent
+          livenessProbe:
+            exec:
+              command:
+                - /bin/bash
+                - -c
+                - mysqladmin -u${MYSQL_USER} -p${MYSQL_ROOT_PASSWORD} ping
+            initialDelaySeconds: 15
+            periodSeconds: 10
+            timeoutSeconds: 5
+          name: mysql
+          ports:
+          - containerPort: 3306
+            protocol: TCP
+          readinessProbe:
+            exec:
+              command:
+              - /bin/bash
+              - -c
+              - mysql -D ${MYSQL_DATABASE} -u${MYSQL_USER} -p${MYSQL_ROOT_PASSWORD} -e 'SELECT 1'
+            initialDelaySeconds: 10
+            timeoutSeconds: 5
+          securityContext:
+            capabilities: {}
+            privileged: false
+          terminationMessagePath: /dev/termination-log
+          volumeMounts:
+          - mountPath: /var/lib/mysql
+            name: model-registry-db-data
+        dnsPolicy: ClusterFirst
+        restartPolicy: Always
+        volumes:
+        - name: model-registry-db-data
+          persistentVolumeClaim:
+            claimName: model-registry-db
+- apiVersion: v1
+  kind: Secret
+  metadata:
+    annotations:
+      template.openshift.io/expose-database_name: '{.data[''database-name'']}'
+      template.openshift.io/expose-password: '{.data[''database-password'']}'
+      template.openshift.io/expose-username: '{.data[''database-user'']}'
+    name: model-registry-db
+  stringData:
+    database-name: "model_registry"
+    database-password: "TheBlurstOfTimes"
+    database-user: "mlmduser"
+kind: List
+metadata: {}