Use client instead of dyn_client in wrapper resource get calls

Author: dbasunag

conftest.py

@@ -513,7 +513,7 @@ def fail_if_missing_dependent_operators(admin_client: DynamicClient) -> None:
         for operator_name in dependent_operators.split(","):
             csvs = list(
                 ClusterServiceVersion.get(
-                    dyn_client=admin_client,
+                    client=admin_client,
                     namespace=py_config["applications_namespace"],
                 )
             )

tests/conftest.py

@@ -357,7 +357,7 @@ def _decode_split_data(_data: str) -> list[str]:
 
     if users_Secret := list(
         Secret.get(
-            dyn_client=admin_client,
+            client=admin_client,
             name=secret_name,
             namespace=secret_ns,
         )
@@ -635,7 +635,7 @@ def minio_data_connection(
 
 @pytest.fixture(scope="session")
 def nodes(admin_client: DynamicClient) -> Generator[list[Node], Any, Any]:
-    yield list(Node.get(dyn_client=admin_client))
+    yield list(Node.get(client=admin_client))
 
 
 @pytest.fixture(scope="session")

utilities/general.py

@@ -250,7 +250,7 @@ def wait_for_pods_by_labels(
     """
     pods = list(
         Pod.get(
-            dyn_client=admin_client,
+            client=admin_client,
             namespace=namespace,
             label_selector=label_selector,
         )
@@ -448,7 +448,7 @@ def wait_for_pods_running(
         wait_timeout=180,
         sleep=5,
         func=get_not_running_pods,
-        pods=list(Pod.get(dyn_client=admin_client, namespace=namespace_name)),
+        pods=list(Pod.get(client=admin_client, namespace=namespace_name)),
         exceptions_dict={NotFoundError: [], ResourceNotFoundError: []},
     )
     sample = None

utilities/inference_utils.py

@@ -746,7 +746,7 @@ def create_isvc(
         if wait and not stop_resume:
             # Modelmesh 2nd server in the ns will fail to be Ready; isvc needs to be re-applied
             if deployment_mode == KServeDeploymentType.MODEL_MESH:
-                for isvc in InferenceService.get(dyn_client=client, namespace=namespace):
+                for isvc in InferenceService.get(client=client, namespace=namespace):
                     _runtime = get_inference_serving_runtime(isvc=isvc)
                     isvc_annotations = isvc.instance.metadata.annotations
                     if (

utilities/infra.py

@@ -252,7 +252,7 @@ def wait_for_inference_deployment_replicas(
             exceptions_dict=DEFAULT_CLUSTER_RETRY_EXCEPTIONS,
             func=Deployment.get,
             label_selector=label_selector,
-            dyn_client=client,
+            client=client,
             namespace=ns,
         ):
             deployment_list = list(deployments)
@@ -535,7 +535,7 @@ def get_services_by_isvc_label(
     if svcs := [
         svc
         for svc in Service.get(
-            dyn_client=client,
+            client=client,
             namespace=isvc.namespace,
             label_selector=label_selector,
         )
@@ -562,7 +562,7 @@ def get_pods_by_ig_label(client: DynamicClient, ig: InferenceGraph) -> list[Pod]
     if pods := [
         pod
         for pod in Pod.get(
-            dyn_client=client,
+            client=client,
             namespace=ig.namespace,
             label_selector=label_selector,
         )
@@ -592,7 +592,7 @@ def get_pods_by_isvc_label(client: DynamicClient, isvc: InferenceService, runtim
     if pods := [
         pod
         for pod in Pod.get(
-            dyn_client=client,
+            client=client,
             namespace=isvc.namespace,
             label_selector=label_selector,
         )
@@ -687,7 +687,7 @@ def get_model_route(client: DynamicClient, isvc: InferenceService) -> Route:
     if routes := [
         route
         for route in Route.get(
-            dyn_client=client,
+            client=client,
             namespace=isvc.namespace,
             label_selector=f"inferenceservice-name={isvc.name}",
         )
@@ -869,7 +869,7 @@ def get_product_version(admin_client: DynamicClient) -> Version:
 
     """
     operator_version: str = ""
-    for csv in ClusterServiceVersion.get(dyn_client=admin_client, namespace=py_config["applications_namespace"]):
+    for csv in ClusterServiceVersion.get(client=admin_client, namespace=py_config["applications_namespace"]):
         if re.match("rhods|opendatahub", csv.name):
             operator_version = csv.instance.spec.version
             break
@@ -981,7 +981,7 @@ def wait_for_serverless_pods_deletion(resource: Project | Namespace, admin_clien
 
     """
     client = admin_client or get_client()
-    for pod in Pod.get(dyn_client=client, namespace=resource.name):
+    for pod in Pod.get(client=client, namespace=resource.name):
         try:
             if (
                 pod.exists
@@ -1020,7 +1020,7 @@ def wait_for_isvc_pods(client: DynamicClient, isvc: InferenceService, runtime_na
 
 
 def get_rhods_subscription() -> Subscription | None:
-    subscriptions = Subscription.get(dyn_client=get_client(), namespace=RHOAI_OPERATOR_NAMESPACE)
+    subscriptions = Subscription.get(client=get_client(), namespace=RHOAI_OPERATOR_NAMESPACE)
     if subscriptions:
         for subscription in subscriptions:
             LOGGER.info(f"Checking subscription {subscription.name}")

utilities/jira.py

@@ -59,7 +59,7 @@ def is_jira_open(jira_id: str, admin_client: DynamicClient) -> bool:
             raise ValueError(f"Jira {jira_id}: status is {jira_status} but does not have fix version(s)")
 
         operator_version: str = ""
-        for csv in ClusterServiceVersion.get(dyn_client=admin_client, namespace=py_config["applications_namespace"]):
+        for csv in ClusterServiceVersion.get(client=admin_client, namespace=py_config["applications_namespace"]):
             if re.match("rhods|opendatahub", csv.name):
                 operator_version = csv.instance.spec.version
                 break

utilities/kueue_utils.py

@@ -155,7 +155,7 @@ def check_gated_pods_and_running_pods(
         Pod.get(
             label_selector=",".join(labels),
             namespace=namespace,
-            dyn_client=admin_client,
+            client=admin_client,
         )
     )
     for pod in pods:

utilities/operator_utils.py

@@ -12,7 +12,7 @@
 
 
 def get_cluster_service_version(client: DynamicClient, prefix: str, namespace: str) -> ClusterServiceVersion:
-    csvs = ClusterServiceVersion.get(dyn_client=client, namespace=namespace)
+    csvs = ClusterServiceVersion.get(client=client, namespace=namespace)
     LOGGER.info(f"Looking for {prefix} CSV in namespace {namespace}")
     matching_csvs = [csv for csv in csvs if csv.name.startswith(prefix)]