openshift-python-wrapper 11.0.103__tar.gz → 11.0.106__tar.gz

openshift_python_wrapper-11.0.106/.git

@@ -0,0 +1 @@
+gitdir: /tmp/github-webhook-openshift-python-wrapper-nubyvg1i/.git/worktrees/github-webhook-openshift-python-wrapper-nubyvg1i-worktree-d3caacf7-bc50-409c-8054-202e34c2068f

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/.pre-commit-config.yaml

@@ -10,7 +10,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v6.0.0"
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
@@ -23,7 +23,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/PyCQA/flake8
-    rev: "7.3.0"
+    rev: 7.3.0
     hooks:
       - id: flake8
         args: [--config=.flake8]
@@ -45,13 +45,13 @@ repos:
           ]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.3
+    rev: v0.14.5
     hooks:
       - id: ruff
       - id: ruff-format
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.28.0
+    rev: v8.29.0
     hooks:
       - id: gitleaks
 

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/OWNERS

@@ -4,4 +4,3 @@ approvers:
 reviewers:
   - myakove
   - rnetser
-  - dbasunag

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 11.0.103
+Version: 11.0.106
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Project-URL: homepage, https://github.com/RedHatQE/openshift-python-wrapper
 Project-URL: documentation, https://openshift-python-wrapper.readthedocs.io/en/latest/

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/APIServer}/api_server.py

@@ -72,6 +72,7 @@ class APIServer(Resource):
         self.tls_security_profile = tls_security_profile
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/manifests/ConfigMap/config_map.py

@@ -48,6 +48,7 @@ class ConfigMap(NamespacedResource):
         self.immutable = immutable
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/DNS}/dns_config_openshift_io.py

@@ -55,6 +55,7 @@ class DNS(Resource):
         self.public_zone = public_zone
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/DNS}/dns_operator_openshift_io.py

@@ -94,6 +94,7 @@ class DNS(Resource):
         self.upstream_resolvers = upstream_resolvers
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/manifests/Deployment/deployment.py

@@ -280,6 +280,7 @@ class Deployment(NamespacedResource):
         self.template = template
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/ImageContentSourcePolicy}/image_content_source_policy.py

@@ -49,6 +49,7 @@ class ImageContentSourcePolicy(Resource):
         self.repository_digest_mirrors = repository_digest_mirrors
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/Ingress}/ingress_config_openshift_io.py

@@ -93,6 +93,7 @@ class Ingress(Resource):
         self.required_hsts_policies = required_hsts_policies
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/Ingress}/ingress_networking_k8s_io.py

@@ -42,6 +42,7 @@ class Ingress(Resource):
         self.tls = tls
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/manifests/Machine/machine.py

@@ -69,6 +69,7 @@ class Machine(NamespacedResource):
         self.taints = taints
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/NMState}/nm_state.py

@@ -77,6 +77,7 @@ class NMState(Resource):
         self.tolerations = tolerations
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/OAuth}/oauth.py

@@ -42,6 +42,7 @@ class OAuth(Resource):
         self.token_config = token_config
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/Pipeline}/pipeline.py

@@ -62,6 +62,7 @@ class Pipeline(NamespacedResource):
         self.workspaces = workspaces
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/manifests/Pod/pod.py

@@ -493,6 +493,7 @@ class Pod(NamespacedResource):
         self.volumes = volumes
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103/ocp_resources → openshift_python_wrapper-11.0.106/class_generator/tests/manifests/RouteAdvertisements}/route_advertisements.py

@@ -50,6 +50,7 @@ class RouteAdvertisements(Resource):
         self.target_vrf = target_vrf
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/manifests/Secret/secret.py

@@ -53,6 +53,7 @@ class Secret(NamespacedResource):
         self.type = type
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/manifests/ServiceMeshMember/service_mesh_member.py

@@ -29,6 +29,7 @@ class ServiceMeshMember(NamespacedResource):
         self.control_plane_ref = control_plane_ref
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/manifests/ServingRuntime/serving_runtime.py

@@ -97,6 +97,7 @@ class ServingRuntime(NamespacedResource):
         self.volumes = volumes
 
     def to_dict(self) -> None:
+
         super().to_dict()
 
         if not self.kind_dict and not self.yaml_file:

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/class_generator/tests/test_class_generator.py

@@ -59,7 +59,7 @@ def _test_single_resource(kind: str, tmp_path: Path) -> tuple[str, str] | None:
                     diff_info += f"\nGenerated lines: {len(generated_lines)}, Expected lines: {len(expected_lines)}"
 
                     # Find first differing line
-                    for i, (gen_line, exp_line) in enumerate(zip(generated_lines, expected_lines, strict=False)):
+                    for i, (gen_line, exp_line) in enumerate(zip(generated_lines, expected_lines, strict=True)):
                         if gen_line != exp_line:
                             diff_info += f"\nFirst difference at line {i + 1}:"
                             diff_info += f"\nGenerated: {repr(gen_line[:100])}..."
@@ -89,22 +89,22 @@ def test_parse_explain(tmp_path: Path) -> None:
     """Test all resource kinds in parallel and collect all failures."""
     # List of all resource kinds to test
     resource_kinds = [
-        "Pod",
-        "Pipeline",
-        "OAuth",
-        "Ingress",
+        "APIServer",
         "ClusterOperator",
-        "ImageContentSourcePolicy",
-        "ServiceMeshMember",
-        "NMState",
+        "ConfigMap",
+        "DNS",
         "Deployment",
+        "ImageContentSourcePolicy",
         "Machine",
-        "APIServer",
+        "NMState",
+        "Pod",
         "Secret",
-        "ConfigMap",
-        "DNS",
-        "ServingRuntime",
+        "ServiceMeshMember",
+        "Ingress",
+        "OAuth",
+        "Pipeline",
         "RouteAdvertisements",
+        "ServingRuntime",
     ]
 
     failures: list[tuple[str, str]] = []
@@ -146,9 +146,7 @@ def test_parse_explain(tmp_path: Path) -> None:
 
         # Create a concise failure message for pytest
         failed_kinds = [kind for kind, _ in failures]
-        failure_summary = f"{len(failures)} resource(s) failed: {', '.join(failed_kinds[:5])}"
-        if len(failed_kinds) > 5:
-            failure_summary += f" and {len(failed_kinds) - 5} more"
+        failure_summary = f"{len(failures)} resource(s) failed: {','.join(failed_kinds)}"
 
         # Fail the test with summary - detailed output is already printed above
         raise AssertionError(failure_summary)

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/ocp_resources/datavolume.py

@@ -248,15 +248,16 @@ class DataVolume(NamespacedResource):
         super().wait_deleted(timeout=timeout)
         return self.pvc.wait_deleted(timeout=timeout)
 
-    def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES, wait_for_exists_only=False):
+    def wait(self, timeout=TIMEOUT_10MINUTES, failure_timeout=TIMEOUT_2MINUTES, wait_for_exists_only=False, sleep=1):
         if wait_for_exists_only:
-            return super().wait(timeout=timeout)
+            return super().wait(timeout=timeout, sleep=sleep)
         else:
             self._check_none_pending_status(failure_timeout=failure_timeout)
 
             # If DV's status is not Pending, continue with the flow
             self.wait_for_status(status=self.Status.SUCCEEDED, timeout=timeout)
             self.pvc.wait_for_status(status=PersistentVolumeClaim.Status.BOUND, timeout=timeout)
+            return None
 
     @property
     def pvc(self):

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/ocp_resources/exceptions.py

@@ -88,3 +88,9 @@ class ValidationError(Exception):
         if self.path:
             return f"Validation error at '{self.path}': {self.message}"
         return f"Validation error: {self.message}"
+
+
+class ConditionError(Exception):
+    """Raised when a resource condition reaches an unexpected state."""
+
+    pass

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/ocp_resources/project_request.py

@@ -2,8 +2,11 @@
 
 from typing import Any
 
+from kubernetes.dynamic.exceptions import ForbiddenError
+
 from ocp_resources.project_project_openshift_io import Project
 from ocp_resources.resource import Resource
+from ocp_resources.utils.constants import DEFAULT_CLUSTER_RETRY_EXCEPTIONS, PROTOCOL_ERROR_EXCEPTION_DICT
 
 
 class ProjectRequest(Resource):
@@ -54,7 +57,14 @@ class ProjectRequest(Resource):
             teardown=self.teardown,
             delete_timeout=self.delete_timeout,
         )
-        project.wait_for_status(status=project.Status.ACTIVE)
+
+        # When a ProjectRequest is created, the project is created and the user is added to the project.
+        # RBAC binding may not have propagated yet, causing transient 403 Forbidden errors, so we need to retry
+        # on ForbiddenError as well.
+        project.wait_for_status(
+            status=project.Status.ACTIVE,
+            exceptions_dict=PROTOCOL_ERROR_EXCEPTION_DICT | DEFAULT_CLUSTER_RETRY_EXCEPTIONS | {ForbiddenError: []},
+        )
 
         return project
 

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/ocp_resources/resource.py

@@ -41,6 +41,7 @@ from fake_kubernetes_client.dynamic_client import FakeDynamicClient
 from ocp_resources.event import Event
 from ocp_resources.exceptions import (
     ClientWithBasicAuthError,
+    ConditionError,
     MissingRequiredArgumentError,
     MissingResourceResError,
     ResourceTeardownError,
@@ -956,7 +957,13 @@ class Resource(ResourceConstants):
         return kubernetes.client.CoreV1Api(api_client=self.client.client)
 
     def wait_for_status(
-        self, status: str, timeout: int = TIMEOUT_4MINUTES, stop_status: str | None = None, sleep: int = 1
+        self,
+        status: str,
+        timeout: int = TIMEOUT_4MINUTES,
+        stop_status: str | None = None,
+        sleep: int = 1,
+        exceptions_dict: dict[type[Exception], list[str]] = PROTOCOL_ERROR_EXCEPTION_DICT
+        | DEFAULT_CLUSTER_RETRY_EXCEPTIONS,
     ) -> None:
         """
         Wait for resource to be in status
@@ -965,6 +972,7 @@ class Resource(ResourceConstants):
             status (str): Expected status.
             timeout (int): Time to wait for the resource.
             stop_status (str): Status which should stop the wait and failed.
+            exceptions_dict (dict[type[Exception], list[str]]): Dictionary of exceptions to retry on.
 
         Raises:
             TimeoutExpiredError: If resource in not in desire status.
@@ -974,10 +982,7 @@ class Resource(ResourceConstants):
         samples = TimeoutSampler(
             wait_timeout=timeout,
             sleep=sleep,
-            exceptions_dict={
-                **PROTOCOL_ERROR_EXCEPTION_DICT,
-                **DEFAULT_CLUSTER_RETRY_EXCEPTIONS,
-            },
+            exceptions_dict=exceptions_dict,
             func=lambda: self.exists,
         )
         current_status = None
@@ -1003,15 +1008,18 @@ class Resource(ResourceConstants):
                 self.logger.error(f"Status of {self.kind} {self.name} is {current_status}")
             raise
 
-    def create(self, wait: bool = False) -> ResourceInstance | None:
+    def create(
+        self, wait: bool = False, exceptions_dict: dict[type[Exception], list[str]] = DEFAULT_CLUSTER_RETRY_EXCEPTIONS
+    ) -> ResourceInstance | None:
         """
         Create resource.
 
         Args:
             wait (bool) : True to wait for resource status.
+            exceptions_dict (dict[type[Exception], list[str]]): Dictionary of exceptions to retry on.
 
         Returns:
-            bool: True if create succeeded, False otherwise.
+            ResourceInstance | None: Created resource instance or None if create failed.
         """
         self.to_dict()
 
@@ -1023,10 +1031,13 @@ class Resource(ResourceConstants):
         self.logger.info(f"Create {self.kind} {self.name}")
         self.logger.info(f"Posting {hashed_res}")
         self.logger.debug(f"\n{yaml.dump(hashed_res)}")
-        resource_kwargs = {"body": self.res, "namespace": self.namespace}
+        resource_kwargs: dict[str, Any] = {"body": self.res, "namespace": self.namespace}
         if self.dry_run:
             resource_kwargs["dry_run"] = "All"
-        resource_ = self.api.create(**resource_kwargs)
+
+        resource_ = Resource.retry_cluster_exceptions(
+            func=self.api.create, exceptions_dict=exceptions_dict, **resource_kwargs
+        )
         with contextlib.suppress(ForbiddenError, AttributeError, NotFoundError):
             # some resources do not support get() (no instance) or the client do not have permissions
             self.initial_resource_version = self.instance.metadata.resourceVersion
@@ -1233,6 +1244,8 @@ class Resource(ResourceConstants):
         sleep_time: int = 1,
         reason: str | None = None,
         message: str = "",
+        stop_condition: str | None = None,
+        stop_status: str = "True",
     ) -> None:
         """
         Wait for Resource condition to be in desire status.
@@ -1244,9 +1257,14 @@ class Resource(ResourceConstants):
             message (str): Expected condition text inclusion.
             timeout (int): Time to wait for the resource.
             sleep_time(int): Interval between each retry when checking the resource's condition.
+            stop_condition (str | None): Condition which should stop the wait and fail.
+                Note: Matching for stop_condition only uses condition type and status.
+                The reason and message fields are ignored when checking for stop_condition.
+            stop_status (str): Status of the stop condition which should stop the wait and fail.
 
         Raises:
-            TimeoutExpiredError: If Resource condition in not in desire status.
+            TimeoutExpiredError: If Resource condition is not in desired status within timeout.
+            ConditionError: If the desired condition is not met and stop_condition is detected before timeout.
         """
         self.logger.info(f"Wait for {self.kind}/{self.name}'s '{condition}' condition to be '{status}'")
 
@@ -1260,6 +1278,12 @@ class Resource(ResourceConstants):
             if sample:
                 for cond in sample.get("status", {}).get("conditions", []):
                     actual_condition = {"type": cond["type"], "status": cond["status"]}
+
+                    if stop_condition and actual_condition == {"type": stop_condition, "status": stop_status}:
+                        raise ConditionError(
+                            f"{self.kind} {self.name} reached stop_condition '{stop_condition}' in status '{stop_status}':\n{cond}"
+                        )
+
                     expected_condition = {"type": condition, "status": status}
                     if reason is not None:
                         actual_condition["reason"] = cond.get("reason", "")

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/ocp_resources/virtual_machine_import.py

@@ -195,11 +195,12 @@ class VirtualMachineImport(NamespacedResource):
         cond_reason=SucceededConditionReason.VIRTUAL_MACHINE_READY,
         cond_status=Condition.Status.TRUE,
         cond_type=Condition.SUCCEEDED,
+        sleep=1,
     ):
         self.logger.info(f"Wait for {self.kind} {self.name} {cond_reason} condition to be {cond_status}")
         samples = TimeoutSampler(
             wait_timeout=timeout,
-            sleep=1,
+            sleep=sleep,
             exceptions_dict=PROTOCOL_ERROR_EXCEPTION_DICT,
             func=self.api.get,
             field_selector=f"metadata.name=={self.name}",

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/pyproject.toml

@@ -72,7 +72,7 @@ include = [
 [project]
 requires-python = ">=3.10"
 name = "openshift-python-wrapper"
-version = "11.0.103"
+version = "11.0.106"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 readme = "README.md"
 license = "Apache-2.0"

{openshift_python_wrapper-11.0.103 → openshift_python_wrapper-11.0.106}/uv.lock

@@ -1206,7 +1206,7 @@ wheels = [
 
 [[package]]
 name = "openshift-python-wrapper"
-version = "11.0.103"
+version = "11.0.106"
 source = { editable = "." }
 dependencies = [
     { name = "cloup" },

openshift_python_wrapper-11.0.103/.github/workflows/code-check.yml.old

@@ -1,25 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: code-check
-on:
-  pull_request:
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install tox
-      - name: Run tox
-        run: |
-          tox -e code-check,unittests,validate-resources