krkn-lib 5.1.5__tar.gz → 5.1.10__tar.gz

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: krkn-lib
-Version: 5.1.5
+Version: 5.1.10
 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,15 +13,16 @@ 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)
 Requires-Dist: cython (==3.0)
 Requires-Dist: deprecation (==2.1.0)
-Requires-Dist: elasticsearch (==7.13.4)
-Requires-Dist: elasticsearch-dsl (==7.4.1)
+Requires-Dist: elasticsearch (==8.19.1)
+Requires-Dist: elasticsearch-dsl (==8.18.0)
 Requires-Dist: kubeconfig (>=1.1.1,<2.0.0)
-Requires-Dist: kubernetes (==28.1.0)
+Requires-Dist: kubernetes (==34.1.0)
 Requires-Dist: numpy (==1.26.4)
 Requires-Dist: prometheus-api-client (>=0.5.4,<0.6.0)
 Requires-Dist: pytz (>=2023.3,<2024.0)

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "krkn-lib"
-version = "5.1.5"
+version = "5.1.10"
 description = "Foundation library for Kraken"
 authors = ["Red Hat Chaos Team"]
 license = "Apache-2.0"
@@ -10,7 +10,7 @@ homepage = "https://github.com/redhat-chaos/krkn"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-kubernetes ="28.1.0"
+kubernetes ="34.1.0"
 sphinxnotes-markdown-builder="^0.5.6"
 requests="^2.29.0"
 kubeconfig = "^1.1.1"
@@ -20,8 +20,8 @@ tzlocal = "5.1"
 pytz = "^2023.3"
 PyYAML = "6.0.1"
 prometheus-api-client = "^0.5.4"
-elasticsearch = "7.13.4"
-elasticsearch-dsl = "7.4.1"
+elasticsearch = "8.19.1"
+elasticsearch-dsl = "8.18.0"
 wheel = "^0.42.0"
 cython = "3.0"
 numpy= "1.26.4"

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/src/krkn_lib/k8s/krkn_kubernetes.py

@@ -166,7 +166,13 @@ class KrknKubernetes:
 
             client.Configuration.set_default(self.client_config)
             self.watch_resource = watch.Watch()
+            # Get the logger for the kubernetes client
+            kubernetes_logger = logging.getLogger('kubernetes')
 
+            # Set the logging level to a higher level than DEBUG, 
+            # such as INFO, WARNING, or ERROR
+            # This will effectively disable DEBUG level messages.
+            kubernetes_logger.setLevel(logging.INFO)
         except OSError:
             raise Exception(
                 "Invalid kube-config file: {0}. "
@@ -528,6 +534,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 +544,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 +561,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
 
@@ -3130,3 +3147,36 @@ class KrknKubernetes:
             pids_list = list(filter(None, pids_list))
             return pids_list
         return None
+
+    def list_pod_network_interfaces(
+        self, pod_name: str, namespace: str, container_name: str = None
+    ) -> list[str]:
+        """
+        Lists the network interfaces of a pod (Linux only)
+        :param pod_name: the name of the pod
+        :param namespace: the namespaces of the pod
+        :param container_name: the container of the pod where the interfaces
+            will be listed, if None the first will be picked
+        :return: the list of the interfaces
+        """
+
+        if not self.check_if_pod_exists(pod_name, namespace):
+            raise Exception(
+                f"target pod {pod_name} does not exist in "
+                f"namespace {namespace}"
+            )
+
+        cmd = "ls /sys/class/net"
+        nics_str = self.exec_cmd_in_pod(
+            [cmd],
+            pod_name,
+            namespace,
+            container_name,
+        )
+        nics = nics_str.split("\n")
+        try:
+            nics.remove("lo")
+            nics.remove("")
+        except ValueError:
+            pass
+        return nics

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/src/krkn_lib/k8s/pod_monitor/pod_monitor.py

@@ -1,10 +1,9 @@
-import os
 import re
 from concurrent.futures import Future
 from concurrent.futures.thread import ThreadPoolExecutor
 from functools import partial
 
-from kubernetes import config, watch
+from kubernetes import watch
 from kubernetes.client import V1Pod, CoreV1Api
 
 from krkn_lib.models.pod_monitor.models import (
@@ -14,8 +13,6 @@ from krkn_lib.models.pod_monitor.models import (
     PodStatus,
 )
 
-config.load_kube_config(os.path.join(os.environ["HOME"], ".kube/config"))
-
 
 def _select_pods(
     select_partial: partial,

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/src/krkn_lib/models/elastic/models.py

@@ -118,6 +118,7 @@ class ElasticHealthChecks(InnerDoc):
 class ElasticVirtChecks(InnerDoc):
     vm_name = Text()
     ip_address = Text()
+    new_ip_address = Text()
     namespace = Text()
     node_name = Text()
     status = Boolean()
@@ -243,6 +244,7 @@ class ElasticChaosRunTelemetry(Document):
                 ElasticVirtChecks(
                     vm_name=info.vm_name,
                     ip_address=info.ip_address,
+                    new_ip_address=info.new_ip_address,
                     namespace=info.namespace,
                     node_name=info.node_name,
                     status=info.status,

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/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.5 → krkn_lib-5.1.10}/src/krkn_lib/models/telemetry/models.py

@@ -436,6 +436,10 @@ class VirtCheck:
     """
     Vm ip address
     """
+    new_ip_address: str
+    """
+    New Ip address when vm restarts
+    """
     namespace: str
     """
     Namespace
@@ -471,6 +475,7 @@ class VirtCheck:
             self.start_timestamp = json_dict.get("start_timestamp", "")
             self.end_timestamp = json_dict.get("end_timestamp", "")
             self.duration = json_dict.get("duration", "")
+            self.new_ip_address = json_dict.get("new_ip_address", "")
 
 
 @dataclass(order=False)

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/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)
 
@@ -582,6 +583,7 @@ class BaseTest(unittest.TestCase):
                     "start_timestamp": "2025-03-12T14:57:34.555878",
                     "end_timestamp": "2025-03-12T14:57:54.904352",
                     "duration": 20.348474,
+                    "new_ip_address": ""
                 },
                 {
                     "node_name": "h27-r660",
@@ -592,6 +594,7 @@ class BaseTest(unittest.TestCase):
                     "start_timestamp": "2025-03-12T14:57:34.759105",
                     "end_timestamp": "2025-03-12T14:57:54.904352",
                     "duration": 20.145247,
+                    "new_ip_address": ""
                 },
                 {
                     "node_name": "h10-r660",
@@ -602,6 +605,7 @@ class BaseTest(unittest.TestCase):
                     "start_timestamp": "2025-03-12T14:57:35.308957",
                     "end_timestamp": "2025-03-12T14:57:54.904352",
                     "duration": 19.595395,
+                    "new_ip_address": "0.0.0.3"
                 },
             ],
             "total_node_count": 3,

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/src/krkn_lib/tests/test_krkn_elastic_models.py

@@ -222,6 +222,12 @@ class TestKrknElasticModels(BaseTest):
         self.assertEqual(
             elastic_telemetry.virt_checks[0].ip_address, "0.0.0.0"
         )
+        self.assertEqual(
+            elastic_telemetry.virt_checks[0].new_ip_address, ""
+        )
+        self.assertEqual(
+            elastic_telemetry.virt_checks[2].new_ip_address, "0.0.0.3"
+        )
         self.assertEqual(
             elastic_telemetry.virt_checks[0].namespace, "benchmark-runner"
         )

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/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.5 → krkn_lib-5.1.10}/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:
@@ -140,6 +173,19 @@ class KrknKubernetesTestsList(BaseTest):
             len(schedulable_nodes), len(schedulable_nodes_empty_selector)
         )
 
+    def test_list_pod_network_interfaces(self):
+        namespace = "test-cid-" + self.get_random_string(10)
+        base_pod_name = "test-name-" + self.get_random_string(10)
+        self.deploy_namespace(namespace, [])
+        self.deploy_fedtools(namespace=namespace, name=base_pod_name)
+        self.wait_pod(base_pod_name, namespace)
+
+        nics = self.lib_k8s.list_pod_network_interfaces(
+            base_pod_name, namespace
+        )
+        self.assertGreater(len(nics), 0)
+        self.assertTrue("eth0" in nics)
+
 
 if __name__ == "__main__":
     unittest.main()

{krkn_lib-5.1.5 → krkn_lib-5.1.10}/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.5 → krkn_lib-5.1.10}/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.5 → krkn_lib-5.1.10}/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