krkn-lib 5.1.6__tar.gz → 5.1.8__tar.gz

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: krkn-lib
-Version: 5.1.6
+Version: 5.1.8
 Summary: Foundation library for Kraken
 License: Apache-2.0
+License-File: LICENSE
 Author: Red Hat Chaos Team
 Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: Apache Software License
@@ -12,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: PyYAML (==6.0.1)
 Requires-Dist: base64io (>=1.0.3,<2.0.0)
 Requires-Dist: coverage (>=7.6.12,<8.0.0)

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "krkn-lib"
-version = "5.1.6"
+version = "5.1.8"
 description = "Foundation library for Kraken"
 authors = ["Red Hat Chaos Team"]
 license = "Apache-2.0"

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/k8s/krkn_kubernetes.py

@@ -528,6 +528,7 @@ class KrknKubernetes:
         namespace: str,
         label_selector: str = None,
         field_selector: str = None,
+        exclude_label: str = None,
     ) -> list[str]:
         """
         List pods in the given namespace
@@ -537,6 +538,8 @@ class KrknKubernetes:
             (optional default `None`)
         :param field_selector: filter results by config details
             select only running pods by setting "status.phase=Running"
+        :param exclude_label: exclude pods matching this label
+            in format "key=value" (optional default `None`)
         :return: a list of pod names
         """
         pods = []
@@ -552,6 +555,14 @@ class KrknKubernetes:
             raise e
         for ret_list in ret:
             for pod in ret_list.items:
+                # Skip pods with the exclude label if specified
+                if exclude_label and pod.metadata.labels:
+                    exclude_key, exclude_value = exclude_label.split("=", 1)
+                    if (
+                        exclude_key in pod.metadata.labels
+                        and pod.metadata.labels[exclude_key] == exclude_value
+                    ):
+                        continue
                 pods.append(pod.metadata.name)
         return pods
 

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/k8s/pod_monitor/pod_monitor.py

@@ -13,6 +13,7 @@ from krkn_lib.models.pod_monitor.models import (
     PodStatus,
 )
 
+
 def _select_pods(
     select_partial: partial,
     namespace_pattern: str = None,

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/models/pod_monitor/models.py

@@ -8,6 +8,7 @@ from krkn_lib.models.k8s import PodsStatus, AffectedPod
 
 
 class PodStatus(Enum):
+    UNDEFINED = 0
     READY = 1
     NOT_READY = 2
     DELETION_SCHEDULED = 3
@@ -20,6 +21,7 @@ class PodEvent:
     status: PodStatus
 
     def __init__(self, timestamp: float = None):
+        self.status = PodStatus.UNDEFINED
         if not timestamp:
             self._timestamp = time.time()
         else:
@@ -142,12 +144,18 @@ class PodsSnapshot:
                             )
                         )
                     else:
+
+                        # pod stayed ready but was restarted
+                        # or has a failed container
                         pods_status.recovered.append(
                             AffectedPod(
                                 pod_name=pod.name,
                                 namespace=pod.namespace,
                                 pod_readiness_time=ready_status.timestamp
                                 - status_change.timestamp,
+                                pod_rescheduling_time=0,
+                                total_recovery_time=ready_status.timestamp
+                                - status_change.timestamp,
                             )
                         )
                     break

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/tests/base_test.py

@@ -165,12 +165,13 @@ class BaseTest(unittest.TestCase):
 
     def deploy_fake_kraken(
         self,
+        name: str = "kraken-deployment",
         namespace: str = "default",
         random_label: str = None,
         node_name: str = None,
     ):
         template = self.template_to_pod(
-            "kraken-deployment", namespace, random_label, node_name
+            name, namespace, random_label, node_name
         )
         self.apply_template(template)
 

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/tests/test_krkn_kubernetes_check.py

@@ -82,7 +82,9 @@ class KrknKubernetesTestsCheck(BaseTest):
         bad_namespace = "test-ns-" + self.get_random_string(10)
         self.deploy_namespace(bad_namespace, [])
         self.deploy_fake_kraken(
-            bad_namespace, random_label=None, node_name="do_not_exist"
+            namespace=bad_namespace,
+            random_label=None,
+            node_name="do_not_exist",
         )
         status = self.lib_k8s.monitor_namespace(namespace=bad_namespace)
         # sleeping for a while just in case
@@ -108,7 +110,9 @@ class KrknKubernetesTestsCheck(BaseTest):
         bad_namespace = "test-ns-" + self.get_random_string(10)
         self.deploy_namespace(bad_namespace, [])
         self.deploy_fake_kraken(
-            bad_namespace, random_label=None, node_name="do_not_exist"
+            namespace=bad_namespace,
+            random_label=None,
+            node_name="do_not_exist",
         )
         status = self.lib_k8s.monitor_component(
             iteration=1, component_namespace=bad_namespace

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/tests/test_krkn_kubernetes_list.py

@@ -67,6 +67,8 @@ class KrknKubernetesTestsList(BaseTest):
         namespace = "test-lp" + self.get_random_string(10)
         self.deploy_namespace(namespace, [])
         self.deploy_fake_kraken(namespace=namespace)
+
+        # Test basic pod listing
         pods = self.lib_k8s.list_pods(namespace=namespace)
         self.assertTrue(len(pods) == 1)
         self.assertIn("kraken-deployment", pods)
@@ -83,7 +85,38 @@ class KrknKubernetesTestsList(BaseTest):
             namespace=namespace, field_selector="status.phase=Terminating"
         )
         self.assertTrue(len(pods) == 0)
+
+        # Test with exclude_label - should not exclude
+        # any pods (no matching labels)
+        pods = self.lib_k8s.list_pods(
+            namespace=namespace, exclude_label="skip=true"
+        )
+        self.assertTrue(len(pods) == 1)
+        self.assertIn("kraken-deployment", pods)
+
+        # Add a pod with the exclude label leveraging random_label will set
+        # random=skip
+        self.deploy_fake_kraken(
+            namespace=namespace, name="kraken-exclude", random_label="skip"
+        )
+
+        # Test listing all pods without exclusion
+        pods = self.lib_k8s.list_pods(namespace=namespace)
+        self.assertTrue(len(pods) == 2)
+        self.assertIn("kraken-deployment", pods)
+        self.assertIn("kraken-exclude", pods)
+
+        # Test with exclude_label - should exclude the labeled pod
+        pods = self.lib_k8s.list_pods(
+            namespace=namespace, exclude_label="random=skip"
+        )
+        self.assertTrue(len(pods) == 1)
+        self.assertIn("kraken-deployment", pods)
+        self.assertNotIn("kraken-exclude", pods)
+
+        # Clean up
         self.pod_delete_queue.put(["kraken-deployment", namespace])
+        self.pod_delete_queue.put(["kraken-exclude", namespace])
 
     def test_list_ready_nodes(self):
         try:

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/tests/test_krkn_kubernetes_pods_monitor.py

@@ -441,8 +441,12 @@ class TestKrknKubernetesPodsMonitor(BaseTest):
         pods_status = snapshot.get_pods_status()
         self.background_delete_ns(namespace)
         self.assertEqual(len(pods_status.recovered), 1)
-        self.assertEqual(pods_status.recovered[0].pod_rescheduling_time, None)
+        self.assertEqual(pods_status.recovered[0].pod_rescheduling_time, 0)
         self.assertGreater(pods_status.recovered[0].pod_readiness_time, 0)
+        self.assertEqual(
+            pods_status.recovered[0].total_recovery_time,
+            pods_status.recovered[0].pod_readiness_time,
+        )
 
     def test_monitor_stopping_earlier(self):
 

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/tests/test_utils.py

@@ -426,7 +426,25 @@ class UtilFunctionTests(BaseTest):
         os.environ["JOB_NAME"] = "1953335493844275200"
         ci_job_url = utils.get_ci_job_url()
         print("ci job url" + str(ci_job_url))
-        self.assertIn("prow.ci.openshift.org", ci_job_url)
+        self.assertIn(
+            "prow.ci.openshift.org/view/gs/origin-ci-test", ci_job_url
+        )
+        os.environ["PULL_NUMBER"] = "68493"
+        os.environ["PROW_JOB_ID"] = os.environ["JOB_NAME"] = (
+            "1965813126276321280"
+        )
+        os.environ["JOB_TYPE"] = "presubmit"
+
+        os.environ["BUILD_ID"] = (
+            "rehearse-68493-periodic-ci-redhat-chaos-prow-scripts-main-4.20-nightly-krkn-hub-node-tests-aws-ipsec"  # NOQA
+        )
+
+        ci_job_url = utils.get_ci_job_url()
+        print("ci job url" + str(ci_job_url))
+        self.assertIn(
+            "prow.ci.openshift.org/view/gs/test-platform-results", ci_job_url
+        )
+
         os.environ["PROW_JOB_ID"] = ""
         os.environ["BUILD_URL"] = (
             "https://jenkins-csb-openshift-qe-mastern.dno.corp.redhat.com/job/scale-ci/job/e2e-benchmarking-multibranch-pipeline/job/kraken/"  # NOQA

{krkn_lib-5.1.6 → krkn_lib-5.1.8}/src/krkn_lib/utils/functions.py

@@ -472,10 +472,25 @@ def get_ci_job_url():
         prow_base_url = (
             "https://prow.ci.openshift.org/view/gs/origin-ci-test/logs"
         )
+
+        prow_pr_base_url = "https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_release"  # NOQA
         task_id = os.getenv("BUILD_ID")
         job_id = os.getenv("JOB_NAME")
-
-        build_url = f"{prow_base_url}/{job_id}/{task_id}"
+        pull_number = os.getenv("PULL_NUMBER")
+        job_type = os.getenv("JOB_TYPE")
+        if job_type == "presubmit" and "pull" in task_id:
+            # Indicates a ci test triggered in PR against source code
+            job_type = "pull"
+        if job_type == "presubmit" and "rehearse" in task_id:
+            # Indicates a rehearsel in PR against openshift/release repo
+            job_type = "pull"
+        # Handle cases where a periodic job iw triggered via pull request
+        if job_type == "periodic" and pull_number:
+            job_type = "pull"
+        if job_type == "pull":
+            build_url = f"{prow_pr_base_url}/{pull_number}/{task_id}/{job_id}"
+        else:
+            build_url = f"{prow_base_url}/{job_id}/{task_id}"
 
     elif os.getenv("BUILD_URL", ""):
         # Jenkins build url