Merge pull request #4927 from pmtk/rebase-ai-model_serving-2.20.0

openshift-merge-bot[bot] · web-flow · commit a45eb9a8dcef · 2025-05-22T06:59:41.000Z
USHIFT-5480: Rebase RHOAI to 2.20
diff --git a/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml b/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml
@@ -40,7 +40,7 @@ data:
         "localGatewayService" : "kserve-local-gateway.istio-system.svc.cluster.local",
         "ingressDomain"  : "example.com",
         "ingressClassName" : "istio",
-        "domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
+        "domainTemplate": "example.com",
         "urlScheme": "https",
         "disableIstioVirtualHost": false, 
         "disableIngressCreation": true
diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/inferenceservice-config-patch.yaml b/assets/optional/ai-model-serving/kserve/overlays/odh/inferenceservice-config-patch.yaml
@@ -32,7 +32,7 @@ data:
         "localGatewayService" : "kserve-local-gateway.istio-system.svc.cluster.local",
         "ingressDomain"  : "example.com",
         "ingressClassName" : "istio",
-        "domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
+        "domainTemplate": "example.com",
         "urlScheme": "https",
         "disableIstioVirtualHost": false, 
         "disableIngressCreation": true
diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/params.env b/assets/optional/ai-model-serving/kserve/overlays/odh/params.env
@@ -1,5 +1,5 @@
-kserve-controller=quay.io/modh/kserve-controller@sha256:62aa39acd23cd8097fc48b5b30fe35572efb46adc5d04e4215aadb77193e71df
-kserve-agent=quay.io/modh/kserve-agent@sha256:84d037d1ad3126f089298460a380041e2f819ce3af3ff21fc781bbf6b6ea81e3
-kserve-router=quay.io/modh/kserve-router@sha256:9def4776bc51cd2d78f4d6d57fd707a207616de4f7064c1f9a440af3f42ce741
-kserve-storage-initializer=quay.io/modh/kserve-storage-initializer@sha256:d361e822b8db152f431d7be48ad5afb6e459497e61441da9db961a63d5e7b242
-oauth-proxy=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08
+kserve-controller=quay.io/modh/kserve-controller@sha256:ebd5b4f7c816fc297055ecf44e80e81a20c5b289c64c37b5a55fad3c4c98d63a
+kserve-agent=quay.io/modh/kserve-agent@sha256:bc135bada2f5817cfbd111c868341bff3ab9e426f7b321fbb2deda1396bd7c4b
+kserve-router=quay.io/modh/kserve-router@sha256:324e2dab6be2cadbdcf137c9da67f9eb6fb1416b1ed77a5b06e2af181369b230
+kserve-storage-initializer=quay.io/modh/kserve-storage-initializer@sha256:baaa0a63ab0c8345da3fcb12eb35c58233e07cb2bb16772c6721c2ed26aad7fd
+oauth-proxy=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08
diff --git a/assets/optional/ai-model-serving/kserve/rbac/role.yaml b/assets/optional/ai-model-serving/kserve/rbac/role.yaml
@@ -38,9 +38,17 @@ rules:
   - ""
   resources:
   - secrets
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
   - serviceaccounts
   verbs:
+  - create
+  - delete
   - get
+  - patch
 - apiGroups:
   - admissionregistration.k8s.io
   resources:
@@ -111,12 +119,24 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resourceNames:
+  - kserve-inferencegraph-auth-verifiers
+  resources:
+  - clusterrolebindings
+  verbs:
+  - create
+  - get
+  - patch
+  - update
 - apiGroups:
   - route.openshift.io
   resources:
   - routes
   verbs:
   - create
+  - delete
   - get
   - list
   - patch
diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json
@@ -1,20 +1,21 @@
 {
   "release": {
-    "base": "2.19.0"
+    "base": "2.20.0"
   },
   "images": {
-    "caikit-tgis-image": "quay.io/modh/caikit-tgis-serving@sha256:2c7eef73708b5d73de33153459ac7238fdcf517cdc3544c775981f5814b4b6ed",
-    "caikit-standalone-image": "quay.io/modh/caikit-nlp@sha256:ada8949b81e646809101edfc76738eb5aac362f783eb2facc8aeed21c7c1512f",
+    "caikit-tgis-image": "quay.io/modh/caikit-tgis-serving@sha256:1d8a9fdd510020ed43ab19f333763257ca8bb1be9dcb330469baa7b110d8a6c8",
+    "caikit-standalone-image": "quay.io/modh/caikit-nlp@sha256:7af5cfa5617723fc9039a01189e6e5e8d8d1d507cd015442588083a386618843",
     "tgis-image": "quay.io/modh/text-generation-inference@sha256:aebf545d8048a59174f70334dc90c6b97ead4602a39cb7598ea68c8d199168a2",
-    "ovms-image": "quay.io/modh/openvino_model_server@sha256:53b7fcf95de9b81e4c8652d0bf4e84e22d5b696827a5d951d863420c68b9cfe8",
-    "vllm-cuda-image": "quay.io/modh/vllm@sha256:4f550996130e7d16cacb24ca9a2865e7cf51eddaab014ceaf31a1ea6ef86d4ec",
-    "vllm-cpu-image": "quay.io/modh/vllm@sha256:881495befb6f807fa6e55f24e820fa67022b57d8ce0022305d89abe799c490fa",
-    "vllm-gaudi-image": "quay.io/modh/vllm@sha256:af6a071be36d8a99476f145d1589d7ede97d2760b93335b14ca26de7417e438c",
-    "vllm-rocm-image": "quay.io/modh/vllm@sha256:7e1d1985b0dd2b5ba2df41fc9c8c3edf13a2d9ed8a4d84db8f00eb6c753bc5c5",
-    "kserve-controller": "quay.io/modh/kserve-controller@sha256:62aa39acd23cd8097fc48b5b30fe35572efb46adc5d04e4215aadb77193e71df",
-    "kserve-agent": "quay.io/modh/kserve-agent@sha256:84d037d1ad3126f089298460a380041e2f819ce3af3ff21fc781bbf6b6ea81e3",
-    "kserve-router": "quay.io/modh/kserve-router@sha256:9def4776bc51cd2d78f4d6d57fd707a207616de4f7064c1f9a440af3f42ce741",
-    "kserve-storage-initializer": "quay.io/modh/kserve-storage-initializer@sha256:d361e822b8db152f431d7be48ad5afb6e459497e61441da9db961a63d5e7b242",
+    "ovms-image": "quay.io/modh/openvino_model_server@sha256:428c00232cbf3b38a3929a0d22d0e13c6388ce353e3853cc2956d175eacf6724",
+    "vllm-cuda-image": "quay.io/modh/vllm@sha256:e3e0f4ba3b78b53b3754bf63baf53bf22d9ec22fdc2974d4f2b5bdf8aeab276b",
+    "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",
+    "vllm-cpu-image": "quay.io/modh/vllm@sha256:9e5f8f4394f599befb9e7f703e30581c4d7f062b8d4974992d6222837977ca5e",
+    "vllm-gaudi-image": "quay.io/modh/vllm@sha256:e7cba648377c6fa29fab30481f97d96ccca76498aaf8bcf5162c74dfa4e0100c",
+    "vllm-rocm-image": "quay.io/modh/vllm@sha256:de5d71c4fb6add81a01171bbabcd2e65fc2d75f0d6e57ca9ebcad9b4084db420",
+    "kserve-controller": "quay.io/modh/kserve-controller@sha256:ebd5b4f7c816fc297055ecf44e80e81a20c5b289c64c37b5a55fad3c4c98d63a",
+    "kserve-agent": "quay.io/modh/kserve-agent@sha256:bc135bada2f5817cfbd111c868341bff3ab9e426f7b321fbb2deda1396bd7c4b",
+    "kserve-router": "quay.io/modh/kserve-router@sha256:324e2dab6be2cadbdcf137c9da67f9eb6fb1416b1ed77a5b06e2af181369b230",
+    "kserve-storage-initializer": "quay.io/modh/kserve-storage-initializer@sha256:baaa0a63ab0c8345da3fcb12eb35c58233e07cb2bb16772c6721c2ed26aad7fd",
     "oauth-proxy": "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08"
   }
 }
diff --git a/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml b/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml
@@ -2,25 +2,28 @@
 images:
   - name: caikit-tgis-image
     newName: quay.io/modh/caikit-tgis-serving
-    digest: sha256:2c7eef73708b5d73de33153459ac7238fdcf517cdc3544c775981f5814b4b6ed
+    digest: sha256:1d8a9fdd510020ed43ab19f333763257ca8bb1be9dcb330469baa7b110d8a6c8
   - name: caikit-standalone-image
     newName: quay.io/modh/caikit-nlp
-    digest: sha256:ada8949b81e646809101edfc76738eb5aac362f783eb2facc8aeed21c7c1512f
+    digest: sha256:7af5cfa5617723fc9039a01189e6e5e8d8d1d507cd015442588083a386618843
   - name: tgis-image
     newName: quay.io/modh/text-generation-inference
     digest: sha256:aebf545d8048a59174f70334dc90c6b97ead4602a39cb7598ea68c8d199168a2
   - name: ovms-image
     newName: quay.io/modh/openvino_model_server
-    digest: sha256:53b7fcf95de9b81e4c8652d0bf4e84e22d5b696827a5d951d863420c68b9cfe8
+    digest: sha256:428c00232cbf3b38a3929a0d22d0e13c6388ce353e3853cc2956d175eacf6724
   - name: vllm-cuda-image
     newName: quay.io/modh/vllm
-    digest: sha256:4f550996130e7d16cacb24ca9a2865e7cf51eddaab014ceaf31a1ea6ef86d4ec
+    digest: sha256:e3e0f4ba3b78b53b3754bf63baf53bf22d9ec22fdc2974d4f2b5bdf8aeab276b
+  - name: ray-tls-generator-image
+    newName: registry.redhat.io/ubi9/ubi-minimal:latest
+    digest: registry.redhat.io/ubi9/ubi-minimal:latest
   - name: vllm-cpu-image
     newName: quay.io/modh/vllm
-    digest: sha256:881495befb6f807fa6e55f24e820fa67022b57d8ce0022305d89abe799c490fa
+    digest: sha256:9e5f8f4394f599befb9e7f703e30581c4d7f062b8d4974992d6222837977ca5e
   - name: vllm-gaudi-image
     newName: quay.io/modh/vllm
-    digest: sha256:af6a071be36d8a99476f145d1589d7ede97d2760b93335b14ca26de7417e438c
+    digest: sha256:e7cba648377c6fa29fab30481f97d96ccca76498aaf8bcf5162c74dfa4e0100c
   - name: vllm-rocm-image
     newName: quay.io/modh/vllm
-    digest: sha256:7e1d1985b0dd2b5ba2df41fc9c8c3edf13a2d9ed8a4d84db8f00eb6c753bc5c5
+    digest: sha256:de5d71c4fb6add81a01171bbabcd2e65fc2d75f0d6e57ca9ebcad9b4084db420
diff --git a/scripts/auto-rebase/last_rebase_ai_model_serving.sh b/scripts/auto-rebase/last_rebase_ai_model_serving.sh
@@ -1,2 +1,2 @@
 #!/bin/bash -x
-./scripts/auto-rebase/rebase_ai_model_serving.sh to "registry.redhat.io/rhoai/odh-operator-bundle:v2.19"
+./scripts/auto-rebase/rebase_ai_model_serving.sh to "registry.redhat.io/rhoai/odh-operator-bundle:v2.20"
diff --git a/scripts/auto-rebase/rebase_ai_model_serving.sh b/scripts/auto-rebase/rebase_ai_model_serving.sh
@@ -198,6 +198,15 @@ EOF
     chmod +x "${last_rebase_script}"
 }
 
+update_rebase_job_entrypoint_sh() {
+    local -r operator_bundle="${1}"
+
+    title "Updating rebase_job_entrypoint.sh"
+    sed -i \
+        "s,^rhoai_release=.*\$,rhoai_release=\"${operator_bundle}\",g" \
+        "${REPOROOT}/scripts/auto-rebase/rebase_job_entrypoint.sh"
+}
+
 rebase_ai_model_serving_to() {
     local -r operator_bundle="${1}"
 
@@ -207,10 +216,11 @@ rebase_ai_model_serving_to() {
     local -r version=$(get_rhoai_bundle_version)
 
     update_last_rebase_ai_model_serving_sh "${operator_bundle}"
+    update_rebase_job_entrypoint_sh "${operator_bundle}"
 
     process_rhoai_manifests
 
-    if [[ -n "$(git status -s assets ./scripts/auto-rebase/last_rebase_ai_model_serving.sh)" ]]; then
+    if [[ -n "$(git status -s ./assets ./scripts/auto-rebase/rebase_job_entrypoint.sh ./scripts/auto-rebase/last_rebase_ai_model_serving.sh)" ]]; then
         title "Detected changes to assets/ or last_rebase_ai_model_serving.sh"
 
         if ! "${NO_BRANCH}"; then
@@ -220,7 +230,7 @@ rebase_ai_model_serving_to() {
         fi
 
         title "Committing changes"
-        git add assets ./scripts/auto-rebase/last_rebase_ai_model_serving.sh
+        git add ./assets ./scripts/auto-rebase/rebase_job_entrypoint.sh ./scripts/auto-rebase/last_rebase_ai_model_serving.sh
         git commit -m "Update AI Model Serving for MicroShift"
     else
         title "No changes to assets/ or last_rebase_ai_model_serving.sh"
diff --git a/scripts/auto-rebase/rebase_job_entrypoint.sh b/scripts/auto-rebase/rebase_job_entrypoint.sh
@@ -75,7 +75,7 @@ pullspec_release_arm64="registry.ci.openshift.org/ocp-arm64/release-arm64:${rele
 #
 # New references can be obtained from:
 # https://catalog.redhat.com/software/containers/rhoai/odh-operator-bundle/659803ca929f3c931af06f28
-rhoai_release="registry.redhat.io/rhoai/odh-operator-bundle:v2.19"
+rhoai_release="registry.redhat.io/rhoai/odh-operator-bundle:v2.20"
 
 APP_ID=$(cat /secrets/pr-creds/app_id) \
 KEY=/secrets/pr-creds/key.pem \
diff --git a/test/suites/ai-model-serving/ai-model-serving-offline.robot b/test/suites/ai-model-serving/ai-model-serving-offline.robot
@@ -19,22 +19,27 @@ ${IP}=              10.44.0.1
 Sanity Test
     [Documentation]    Sanity test for AI Model Serving
 
-    # Warning: Next keyword will fail if the VM was rebooted.
-    # See https://github.com/kserve/kserve/pull/4274
-    # After the issue is fixed and backported: add reboot and retest
-    Wait For A Deployment    test-ai    openvino-resnet-predictor
-    Wait Until Keyword Succeeds    10x    10s
-    ...    Check If Model Is Ready
-    Query Model Metrics
-    Prepare Request Data
-    Query Model Server
+    Model Serving Offline Test
 
     # Check if ingress exists.
     # Enabled only for testing purposes to test Kserve's settings override.
     offline.Run With Kubeconfig    oc    get    ingress    -n    test-ai    openvino-resnet
 
+    offline.Reboot MicroShift Host
+    offline.Wait For Greenboot Health Check To Exit
+    Model Serving Offline Test
+
 
 *** Keywords ***
+Model Serving Offline Test
+    [Documentation]    Waits for the model server and queries it
+    Wait For A Deployment    test-ai    openvino-resnet-predictor
+    Wait Until Keyword Succeeds    10x    10s
+    ...    Check If Model Is Ready
+    Query Model Metrics
+    Prepare Request Data
+    Query Model Server
+
 Wait For A Deployment
     [Documentation]    Wait for a deployment on offline VM
     [Arguments]    ${namespace}    ${name}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/bash -x`
`2`		`-./scripts/auto-rebase/rebase_ai_model_serving.sh to "registry.redhat.io/rhoai/odh-operator-bundle:v2.19"`
	`2`	`+./scripts/auto-rebase/rebase_ai_model_serving.sh to "registry.redhat.io/rhoai/odh-operator-bundle:v2.20"`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ pullspec_release_arm64="registry.ci.openshift.org/ocp-arm64/release-arm64:${rele`
`75`	`75`	`#`
`76`	`76`	`# New references can be obtained from:`
`77`	`77`	`# https://catalog.redhat.com/software/containers/rhoai/odh-operator-bundle/659803ca929f3c931af06f28`
`78`		`-rhoai_release="registry.redhat.io/rhoai/odh-operator-bundle:v2.19"`
	`78`	`+rhoai_release="registry.redhat.io/rhoai/odh-operator-bundle:v2.20"`
`79`	`79`
`80`	`80`	`APP_ID=$(cat /secrets/pr-creds/app_id) \`
`81`	`81`	`KEY=/secrets/pr-creds/key.pem \`