Sync with main for ODH 2.20

.github/workflows/build.yaml

@@ -0,0 +1,67 @@
+name: Build and Push Image for Multi-Arch CI- Additional support for s390x & Power along with arm64 & amd64
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - 'release-[0-9]+\.[0-9]+\.[0-9]+'
+    tags:
+      - 'latest'
+      - 'v*'
+
+
+env:
+  IMAGE_NAME: "odh-model-controller"
+  REPO_NAME: "opendatahub"
+  REGISTRY_NAME: "quay.io"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Quay
+        uses: docker/login-action@v3
+
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USER }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+
+      - name: Set Docker Tag
+        run: |
+          if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
+            echo "TAG=latest" >> $GITHUB_ENV
+          elif [[ "${GITHUB_REF}" == refs/heads/release-* ]]; then
+            VERSION="${GITHUB_REF#refs/heads/release-}"
+            echo "TAG=v${VERSION}-latest" >> $GITHUB_ENV
+          elif [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+            TAG="${GITHUB_REF#refs/tags/}"
+            echo "TAG=${TAG}" >> $GITHUB_ENV
+          else
+            echo "Branch or tag is not found. Image can't be pushed. Please check and try again!!"
+            exit 1
+          fi
+
+      - name: Build and push controller image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
+          context: .
+          file: Containerfile
+          push: true
+          tags: |
+            ${{ env.REGISTRY_NAME }}/${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          debug: true

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= quay.io/${USER}/odh-model-controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.26
+ENVTEST_K8S_VERSION = 1.29
 
 ENGINE ?= docker
 
@@ -69,7 +69,8 @@ vet: ## Run go vet against code.
 
 .PHONY: test
 test: manifests generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" POD_NAMESPACE=default go test -v ./controllers/... -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" POD_NAMESPACE=default \
+		MESH_NAMESPACE=istio-system CONTROL_PLANE_NAME=istio-system go test -v ./controllers/... -coverprofile cover.out
 
 .PHONY: e2e-test
 e2e-test: manifests generate fmt vet ## Run e2e-tests.

OWNERS

@@ -1,21 +1,21 @@
 approvers:
   - danielezonca
-  - davidesalerno
-  - dtrifiro
-  - heyselbi
+  - hdefazio
   - israel-hdez
   - Jooho
-  - rpancham
+  - mholder6
+  - mwaykole
+  - rnetser
   - spolti
   - terrytangyuan
-  - vaibhavjainwiz
   - VedantMahabaleshwarkar
-  - Xaenalt
-  - z103cb
 reviewers:
-  - davidesalerno
+  - hdefazio
   - israel-hdez
   - Jooho
+  - mholder6
+  - mwaykole
+  - rnetser
   - spolti
   - terrytangyuan
   - VedantMahabaleshwarkar

config/base/kustomization.yaml

@@ -12,53 +12,111 @@ configMapGenerator:
 generatorOptions:
   disableNameSuffixHash: true
 
-vars:
-  - fieldref:
+replacements:
+  - source:
+      kind: ConfigMap
+      version: v1
+      name: odh-model-controller-parameters
+      fieldPath: data.tgis-image
+    targets:
+      - select:
+          kind: Template
+          name: caikit-tgis-serving-template
+        fieldPaths:
+          - objects.0.spec.containers.0.image
+  - source:
+      kind: ConfigMap
+      version: v1
+      name: odh-model-controller-parameters
       fieldPath: data.caikit-tgis-image
-    name: caikit-tgis-image
-    objref:
-      apiVersion: v1
+    targets:
+      - select:
+          kind: Template
+          name: caikit-tgis-serving-template
+        fieldPaths:
+          - objects.0.spec.containers.1.image
+  - source:
       kind: ConfigMap
+      version: v1
       name: odh-model-controller-parameters
-  - fieldref:
       fieldPath: data.caikit-standalone-image
-    name: caikit-standalone-image
-    objref:
-      apiVersion: v1
+    targets:
+      - select:
+          kind: Template
+          name: caikit-standalone-serving-template
+        fieldPaths:
+          - objects.0.spec.containers.0.image
+  - source:
       kind: ConfigMap
+      version: v1
       name: odh-model-controller-parameters
-  - fieldref:
       fieldPath: data.tgis-image
-    name: tgis-image
-    objref:
-      apiVersion: v1
+    targets:
+      - select:
+          kind: Template
+          name: tgis-grpc-serving-template
+        fieldPaths:
+          - objects.0.spec.containers.0.image
+  - source:
       kind: ConfigMap
+      version: v1
       name: odh-model-controller-parameters
-  - fieldref:
       fieldPath: data.ovms-image
-    name: ovms-image
-    objref:
-      apiVersion: v1
+    targets:
+      - select:
+          kind: Template
+          name: kserve-ovms
+        fieldPaths:
+          - objects.0.spec.containers.0.image
+      - select:
+          kind: Template
+          name: ovms
+        fieldPaths:
+          - objects.0.spec.containers.0.image    
+  - source:
       kind: ConfigMap
+      version: v1
       name: odh-model-controller-parameters
-  - fieldref:
       fieldPath: data.vllm-image
-    name: vllm-image
-    objref:
-      apiVersion: v1
+    targets:
+      - select:
+          kind: Template
+          name: vllm-runtime-template
+        fieldPaths:
+          - objects.0.spec.containers.0.image
+  - source:
       kind: ConfigMap
+      version: v1
       name: odh-model-controller-parameters
-  - fieldref:
-      fieldPath: metadata.namespace
-    name: mesh-namespace
-    objref:
-      apiVersion: v1
+      fieldPath: data.odh-model-controller
+    targets:
+      - select: 
+          kind: Deployment
+          name: odh-model-controller
+        fieldPaths:
+          - spec.template.spec.containers.0.image
+  - source:
       kind: ConfigMap
+      version: v1
       name: odh-model-controller-parameters
-  - fieldref:
-      fieldPath: data.odh-model-controller
-    name: odh-model-controller
-    objref:
-      apiVersion: v1
+      fieldPath: metadata.namespace
+    targets:
+      - select:
+          kind: ValidatingWebhookConfiguration
+          name: validating-webhook-configuration
+        fieldPaths:
+          - webhooks.0.clientConfig.service.namespace
+  - source:
       kind: ConfigMap
+      version: v1
       name: odh-model-controller-parameters
+      fieldPath: metadata.namespace
+    targets:
+      - select:
+          kind: ClusterRoleBinding
+          name: odh-model-controller-rolebinding-$(mesh_namespace)
+        options:
+          delimiter: '-'
+          index: 4
+        fieldPaths:
+          - metadata.name

config/base/params.env

@@ -2,5 +2,5 @@ odh-model-controller=quay.io/opendatahub/odh-model-controller:fast
 caikit-tgis-image=quay.io/opendatahub/caikit-tgis-serving:fast
 caikit-standalone-image=quay.io/opendatahub/caikit-nlp:fast
 tgis-image=quay.io/opendatahub/text-generation-inference:fast
-ovms-image=quay.io/opendatahub/openvino_model_server:fast
+ovms-image=quay.io/opendatahub/openvino_model_server:2024.3-release
 vllm-image=quay.io/opendatahub/vllm:fast

config/default/kustomization.yaml

@@ -1,8 +1,6 @@
-bases:
+resources:
   - ../rbac
   - ../manager
   - ../webhook
   - ../runtimes
-
-resources:
-  - networkpolicy.yaml
+  - networkpolicy.yaml

config/manager/manager.yaml

@@ -9,7 +9,7 @@ spec:
   selector:
     matchLabels:
       control-plane: odh-model-controller
-  replicas: 3
+  replicas: 1
   template:
     metadata:
       annotations:

config/overlays/dev/kustomization.yaml

@@ -2,8 +2,8 @@ resources:
 - ../../crd/external
 - ../../default
 
-patchesStrategicMerge:
-- odh_model_controller_manager_patch.yaml
+patches:
+- path: odh_model_controller_manager_patch.yaml
 
 namespace: default
 configMapGenerator:
@@ -13,18 +13,16 @@ configMapGenerator:
 generatorOptions:
   disableNameSuffixHash: true
 
-vars:
-- fieldref:
-    fieldPath: metadata.namespace
-  name: mesh-namespace
-  objref:
-    apiVersion: v1
+
+replacements:
+- source:
     kind: ConfigMap
+    version: v1
     name: odh-model-controller-parameters
-- fieldref:
     fieldPath: data.monitoring-namespace
-  name: monitoring-namespace
-  objref:
-    apiVersion: v1
-    kind: ConfigMap
-    name: odh-model-controller-parameters
+  targets:
+  - select:
+      kind: Deployment
+      name: odh-model-controller
+    fieldPaths:
+      - spec.template.spec.containers.0.env.0.value

config/overlays/dev/odh_model_controller_manager_patch.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: odh-model-controller
 spec:
-  replicas: 3
+  replicas: 1
   template:
     spec:
       containers:

config/overlays/odh/kustomization.yaml

@@ -3,8 +3,8 @@ kind: Kustomization
 resources:
   - ../../default
 
-patchesStrategicMerge:
-  - odh_model_controller_manager_patch.yaml
-
+patches:
+- path: odh_model_controller_manager_patch.yaml
+  
 configurations:
-  - params.yaml
+  - params.yaml

config/overlays/odh/odh_model_controller_manager_patch.yaml

@@ -3,7 +3,6 @@ kind: Deployment
 metadata:
   name: odh-model-controller
 spec:
-  replicas: 3
   template:
     spec:
       containers:

config/rbac/role_binding.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: odh-model-controller-rolebinding-$(mesh-namespace)
+  name: odh-model-controller-rolebinding-$(mesh_namespace)
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

config/runtimes/kustomization.yaml

@@ -1,8 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-commonLabels:
-  app: odh-dashboard
-  app.kubernetes.io/part-of: odh-dashboard
+labels:
+  - pairs:
+      app: odh-dashboard
+      app.kubernetes.io/part-of: odh-dashboard
+    includeSelectors: true
 resources:
   - ovms-mm-template.yaml
   - caikit-tgis-template.yaml

config/runtimes/vllm-template.yaml

@@ -43,7 +43,6 @@ objects:
             - "--port=8080"
             - "--model=/mnt/models"
             - "--served-model-name={{.Name}}"
-            - "--distributed-executor-backend=mp"
           env:
             - name: HF_HOME
               value: /tmp/hf_home