Merge branch 'main' into push_container_image_on_merge

Author: dbasunag

.github/workflows/scripts/pr_workflow.py

@@ -296,7 +296,10 @@ def issue_comment_label_actions(
 
     def add_welcome_comment_set_assignee(self) -> None:
         self.pr.create_issue_comment(body=WELCOME_COMMENT)
-        self.pr.add_to_assignees(self.pr.user.login)
+        try:
+            self.pr.add_to_assignees(self.pr.user.login)
+        except UnknownObjectException:
+            LOGGER.warning(f"User {self.pr.user.login} can not be assigned to the PR.")
 
 
 def main() -> None:

tests/model_explainability/conftest.py

@@ -8,8 +8,7 @@
 from ocp_resources.service import Service
 
 from tests.model_explainability.constants import MINIO, MINIO_PORT
-
-OPENDATAHUB_IO: str = "opendatahub.io"
+from utilities.constants import ApiGroups, Labels
 
 
 @pytest.fixture(scope="class")
@@ -43,11 +42,11 @@ def minio_data_connection(
         namespace=model_namespace.name,
         data_dict=request.param["data-dict"],
         label={
-            f"{OPENDATAHUB_IO}/dashboard": "true",
-            f"{OPENDATAHUB_IO}/managed": "true",
+            Labels.OpenDataHub.DASHBOARD: "true",
+            Labels.OpenDataHubIo.MANAGED: "true",
         },
         annotations={
-            f"{OPENDATAHUB_IO}/connection-type": "s3",
+            f"{ApiGroups.OPENDATAHUB_IO}/connection-type": "s3",
             "openshift.io/display-name": "Minio Data Connection",
         },
     ) as minio_secret:

tests/model_explainability/trustyai_service/conftest.py

@@ -27,7 +27,6 @@
 from utilities.infra import update_configmap_data
 
 MINIO: str = "minio"
-OPENDATAHUB_IO: str = "opendatahub.io"
 OPENSHIFT_OPERATORS: str = "openshift-operators"
 
 MARIADB: str = "mariadb"

tests/model_explainability/trustyai_service/drift/conftest.py

@@ -13,7 +13,7 @@
 from tests.model_explainability.trustyai_service.trustyai_service_utils import (
     wait_for_isvc_deployment_registered_by_trustyai_service,
 )
-from utilities.constants import KServeDeploymentType, Ports, Timeout, Labels
+from utilities.constants import ApiGroups, KServeDeploymentType, Ports, Timeout, Labels
 from utilities.inference_utils import create_isvc
 
 MLSERVER: str = "mlserver"
@@ -62,9 +62,9 @@ def mlserver_runtime(
         supported_model_formats=supported_model_formats,
         protocol_versions=["v2"],
         annotations={
-            "opendatahub.io/accelerator-name": "",
-            "opendatahub.io/recommended-accelerators": '["nvidia.com/gpu"]',
-            "opendatahub.io/template-display-name": "KServe MLServer",
+            f"{ApiGroups.OPENDATAHUB_IO}/accelerator-name": "",
+            f"{ApiGroups.OPENDATAHUB_IO}/recommended-accelerators": '["nvidia.com/gpu"]',
+            f"{ApiGroups.OPENDATAHUB_IO}/template-display-name": "KServe MLServer",
             "prometheus.kserve.io/path": "/metrics",
             "prometheus.io/port": str(Ports.REST_PORT),
             "openshift.io/display-name": "mlserver-1.x",

tests/model_registry/conftest.py

@@ -186,7 +186,7 @@ def model_registry_db_deployment(
                             "/var/lib/mysql/datadir",
                             "--default-authentication-plugin=mysql_native_password",
                         ],
-                        "image": "mysql:8.3.0",
+                        "image": "public.ecr.aws/docker/library/mysql:8.3.0",
                         "imagePullPolicy": "IfNotPresent",
                         "livenessProbe": {
                             "exec": {

tests/model_serving/model_server/components/constants.py

@@ -0,0 +1,19 @@
+from utilities.constants import (
+    KServeDeploymentType,
+    ModelAndFormat,
+    ModelFormat,
+    ModelInferenceRuntime,
+    ModelStoragePath,
+    ModelVersion,
+)
+
+KSERVE_RUNTIME_PARAMS = {
+    "runtime-name": ModelInferenceRuntime.OPENVINO_KSERVE_RUNTIME,
+    "model-format": {ModelAndFormat.OPENVINO_IR: ModelVersion.OPSET1},
+}
+SERVERLESS_ISVC_PARAMS = {
+    "name": ModelFormat.OPENVINO,
+    "model-version": ModelVersion.OPSET1,
+    "model-dir": ModelStoragePath.KSERVE_OPENVINO_EXAMPLE_MODEL,
+    "deployment-mode": KServeDeploymentType.SERVERLESS,
+}

tests/model_serving/model_server/components/kserve_dsc_deployment_mode/test_kserve_dsc_default_deployment_mode.py

@@ -50,10 +50,7 @@ def test_isvc_contains_serverless_deployment_mode(
         ovms_inference_service,
     ):
         """Verify that default deployment mode is set to serverless in inference service."""
-        assert (
-            ovms_inference_service.instance.metadata.annotations[Annotations.KserveIo.DEPLOYMENT_MODE]
-            == KServeDeploymentType.SERVERLESS
-        )
+        assert ovms_inference_service.instance.status.deploymentMode == KServeDeploymentType.SERVERLESS
 
     def test_kserve_dsc_serverless_default_deployment_mode(
         self, default_deployment_mode_in_dsc, ovms_inference_service
@@ -83,10 +80,7 @@ def test_isvc_on_dsc_default_deployment_mode_change_to_raw(
         ovms_inference_service,
     ):
         """Verify that Serverless isvc not changed after dsc default deployment mode is changed to raw"""
-        assert (
-            ovms_inference_service.instance.metadata.annotations[Annotations.KserveIo.DEPLOYMENT_MODE]
-            == KServeDeploymentType.SERVERLESS
-        )
+        assert ovms_inference_service.instance.status.deploymentMode == KServeDeploymentType.SERVERLESS
 
     @pytest.mark.parametrize(
         "patched_default_deployment_mode_in_dsc",

tests/model_serving/model_server/components/model_mesh_kserve_co_exist/test_model_mesh_kserve_inference_co_exist.py

@@ -1,62 +1,50 @@
 import pytest
 
+from tests.model_serving.model_server.components.constants import KSERVE_RUNTIME_PARAMS, SERVERLESS_ISVC_PARAMS
 from tests.model_serving.model_server.utils import verify_inference_response
 from utilities.constants import (
-    ModelAndFormat,
-    ModelFormat,
-    ModelInferenceRuntime,
     ModelStoragePath,
-    ModelVersion,
     Protocols,
 )
 from utilities.inference_utils import Inference
 from utilities.manifests.openvino import OPENVINO_INFERENCE_CONFIG, OPENVINO_KSERVE_INFERENCE_CONFIG
 
 pytestmark = [pytest.mark.serverless, pytest.mark.modelmesh, pytest.mark.sanity]
 
-KSERVE_RUNTIME_PARAMS = {
-    "runtime-name": ModelInferenceRuntime.OPENVINO_KSERVE_RUNTIME,
-    "model-format": {ModelAndFormat.OPENVINO_IR: ModelVersion.OPSET1},
-}
-KSERVE_ISVC_PARAMS = {
-    "name": ModelFormat.OPENVINO,
-    "model-version": ModelVersion.OPSET1,
-    "model-dir": ModelStoragePath.KSERVE_OPENVINO_EXAMPLE_MODEL,
-}
 MODELMESH_ISVC_PARAMS = {
     "model-path": ModelStoragePath.OPENVINO_EXAMPLE_MODEL,
     "modelmesh-enabled": True,
 }
 
 
 @pytest.mark.parametrize(
-    "model_namespace, openvino_kserve_serving_runtime, ovms_serverless_inference_service, "
+    "model_namespace, openvino_kserve_serving_runtime, ovms_kserve_inference_service, "
     "http_s3_openvino_model_mesh_inference_service",
     [
         pytest.param(
             {"name": "serverless-model-mesh-openvino", "modelmesh-enabled": True},
             KSERVE_RUNTIME_PARAMS,
-            KSERVE_ISVC_PARAMS,
+            SERVERLESS_ISVC_PARAMS,
             MODELMESH_ISVC_PARAMS,
         )
     ],
     indirect=True,
 )
 class TestOpenVINOServerlessModelMesh:
     def test_serverless_openvino_created_before_model_mesh_ns_rest_inference(
-        self, ovms_serverless_inference_service, http_s3_openvino_model_mesh_inference_service
+        self, ovms_kserve_inference_service, http_s3_openvino_model_mesh_inference_service
     ):
         """Verify that Serverless model can be queried when running with modelmesh inference service"""
         verify_inference_response(
-            inference_service=ovms_serverless_inference_service,
+            inference_service=ovms_kserve_inference_service,
             inference_config=OPENVINO_KSERVE_INFERENCE_CONFIG,
             inference_type=Inference.INFER,
             protocol=Protocols.HTTPS,
             use_default_query=True,
         )
 
     def test_model_mesh_openvino_created_after_serverless_in_namespace_rest_inference(
-        self, ovms_serverless_inference_service, http_s3_openvino_model_mesh_inference_service
+        self, ovms_kserve_inference_service, http_s3_openvino_model_mesh_inference_service
     ):
         """Verify that modelmesh model can be queried when running with kserve inference service"""
         verify_inference_response(
@@ -70,20 +58,20 @@ def test_model_mesh_openvino_created_after_serverless_in_namespace_rest_inferenc
 
 @pytest.mark.parametrize(
     "model_namespace, http_s3_openvino_model_mesh_inference_service, openvino_kserve_serving_runtime, "
-    "ovms_serverless_inference_service, ",
+    "ovms_kserve_inference_service, ",
     [
         pytest.param(
             {"name": "model-mesh-serverless-openvino", "modelmesh-enabled": True},
             MODELMESH_ISVC_PARAMS,
             KSERVE_RUNTIME_PARAMS,
-            KSERVE_ISVC_PARAMS,
+            SERVERLESS_ISVC_PARAMS,
         )
     ],
     indirect=True,
 )
 class TestOpenVINOModelMeshServerless:
     def test_model_mesh_openvino_created_before_serverless_in_namespace_rest_inference(
-        self, http_s3_openvino_model_mesh_inference_service, ovms_serverless_inference_service
+        self, http_s3_openvino_model_mesh_inference_service, ovms_kserve_inference_service
     ):
         """Verify that modelmesh model can be queried when running with kserve inference service"""
         verify_inference_response(
@@ -95,11 +83,11 @@ def test_model_mesh_openvino_created_before_serverless_in_namespace_rest_inferen
         )
 
     def test_serverless_openvino_created_after_model_mesh_ns_rest_inference(
-        self, http_s3_openvino_model_mesh_inference_service, ovms_serverless_inference_service
+        self, http_s3_openvino_model_mesh_inference_service, ovms_kserve_inference_service
     ):
         """Verify that Serverless model can be queried when running with modelmesh inference service"""
         verify_inference_response(
-            inference_service=ovms_serverless_inference_service,
+            inference_service=ovms_kserve_inference_service,
             inference_config=OPENVINO_KSERVE_INFERENCE_CONFIG,
             inference_type=Inference.INFER,
             protocol=Protocols.HTTPS,