Update to openshift_client 2.0

- Only notable change is package naming (finally)

pyproject.toml

@@ -20,7 +20,7 @@ lxml = "*"
 cryptography = "*"
 backoff = "*"
 httpx = { version = "*", extras = ["http2"] }
-openshift-client = ">=1.0.14"
+openshift-client = ">=2"
 apyproxy = "*"
 weakget = "*"
 flaky = "*"
@@ -78,7 +78,7 @@ good-names=["i","j","k",
 implicit_optional = true
 
 [[tool.mypy.overrides]]
-module = ["dynaconf.*", "keycloak.*", "weakget.*", "openshift.*", "apyproxy.*", "click.*", "py.*"]
+module = ["dynaconf.*", "keycloak.*", "weakget.*", "openshift_client.*", "apyproxy.*", "click.*", "py.*"]
 ignore_missing_imports = true
 
 [build-system]

testsuite/gateway/envoy/__init__.py

@@ -3,7 +3,7 @@
 import time
 from typing import Optional
 
-import openshift as oc
+import openshift_client as oc
 
 from testsuite.certificates import Certificate
 from testsuite.gateway import Gateway

testsuite/gateway/gateway_api/gateway.py

@@ -4,7 +4,7 @@
 import json
 from typing import Optional
 
-import openshift as oc
+import openshift_client as oc
 
 from testsuite.certificates import Certificate
 from testsuite.gateway import Gateway

testsuite/openshift/__init__.py

@@ -4,7 +4,7 @@
 from dataclasses import dataclass, field
 from typing import Optional, Literal
 
-from openshift import APIObject, timeout
+from openshift_client import APIObject, timeout
 
 from testsuite.lifecycle import LifecycleObject
 

testsuite/openshift/authorino.py

@@ -3,8 +3,7 @@
 import abc
 from typing import Any, Dict, List
 
-import openshift
-from openshift import selector
+from openshift_client import selector, timeout
 
 from testsuite.openshift.client import OpenShiftClient
 from testsuite.openshift import OpenShiftObject
@@ -74,7 +73,7 @@ def create_instance(
 
     def wait_for_ready(self):
         """Waits until Authorino CR reports ready status"""
-        with openshift.timeout(90):
+        with timeout(90):
             success, _, _ = self.self_selector().until_all(
                 success_func=lambda obj: len(obj.model.status.conditions) > 0
                 and all(x.status == "True" for x in obj.model.status.conditions)

testsuite/openshift/client.py

@@ -5,8 +5,8 @@
 from typing import Dict
 from urllib.parse import urlparse
 
-import openshift as oc
-from openshift import Context, Selector, OpenShiftPythonException
+import openshift_client as oc
+from openshift_client import Context, Selector, OpenShiftPythonException
 
 from .route import OpenshiftRoute
 from .secret import Secret

testsuite/openshift/deployment.py

@@ -3,7 +3,7 @@
 from dataclasses import dataclass
 from typing import Any
 
-import openshift as oc
+import openshift_client as oc
 
 from testsuite.openshift import OpenShiftObject, Selector, modify
 from testsuite.utils import asdict

testsuite/policy/authorization/auth_config.py

@@ -3,7 +3,7 @@
 from functools import cached_property
 from typing import Dict
 
-import openshift as oc
+import openshift_client as oc
 
 from testsuite.utils import asdict
 from testsuite.openshift import OpenShiftObject, modify

testsuite/policy/dns_policy.py

@@ -3,7 +3,7 @@
 from dataclasses import dataclass
 from typing import Optional, Literal
 
-import openshift as oc
+import openshift_client as oc
 
 from testsuite.utils import asdict
 from testsuite.gateway import Referencable

testsuite/policy/rate_limit_policy.py

@@ -4,7 +4,7 @@
 from time import sleep
 from typing import Iterable, Literal, Optional, List
 
-import openshift as oc
+import openshift_client as oc
 
 from testsuite.policy.authorization import Rule
 from testsuite.utils import asdict

testsuite/tests/kuadrant/authorino/metrics/conftest.py

@@ -3,7 +3,7 @@
 import yaml
 
 import pytest
-from openshift import selector
+from openshift_client import selector
 
 from testsuite.openshift.config_map import ConfigMap
 from testsuite.openshift.metrics import ServiceMonitor, MetricsEndpoint, Prometheus

testsuite/tests/kuadrant/authorino/operator/tls/test_webhook.py

@@ -6,8 +6,8 @@
 from typing import Any, Dict
 import pytest
 
-import openshift as oc
-from openshift import OpenShiftPythonException
+import openshift_client as oc
+from openshift_client import OpenShiftPythonException
 
 from testsuite.policy.authorization import Pattern, ValueFrom
 from testsuite.certificates import CertInfo

testsuite/tests/mgc/conftest.py

@@ -1,7 +1,7 @@
 """Conftest for MGC tests"""
 
 import pytest
-from openshift import selector
+from openshift_client import selector
 from weakget import weakget
 
 from testsuite.gateway import CustomReference, GatewayRoute, Exposer