pyxecm 1.5__py3-none-any.whl → 1.6__py3-none-any.whl

pyxecm/customizer/customizer.py

@@ -52,6 +52,10 @@ import sys
 import time
 from dataclasses import dataclass, field
 from datetime import datetime
+import uuid
+import xml.etree.ElementTree as ET
+import json
+import re
 
 # from packaging.version import Version
 
@@ -59,7 +63,8 @@ import requests
 
 # OpenText specific modules:
 import yaml
-from pyxecm import OTAC, OTCS, OTDS, OTIV, OTPD, OTMM, CoreShare
+from pyxecm import OTAC, OTCS, OTDS, OTIV, OTPD, OTMM, CoreShare, OTAWP
+from pyxecm.avts import AVTS
 from pyxecm.customizer.k8s import K8s
 from pyxecm.customizer.m365 import M365
 from pyxecm.customizer.payload import Payload
@@ -105,6 +110,7 @@ class CustomizerSettingsOTDS:
     admin_partition: str = "otds.admin"
     public_url: str = os.environ.get("OTDS_PUBLIC_URL")
     password: str = os.environ.get("OTDS_PASSWORD")
+    bindPassword: str = os.environ.get("BINB_PASSWORD")
     disable_password_policy: bool = True
     enable_audit: bool = True
 
@@ -124,6 +130,7 @@ class CustomizerSettingsOTCS:
     port_backend: int = os.environ.get("OTCS_SERVICE_PORT_OTCS", 8080)
     port_frontend: int = 80
     base_path: str = "/cs/cs"
+    feme_uri: str = os.environ.get("FEME_URI", "ws://feme:4242")
     admin: str = os.environ.get("OTCS_ADMIN", "admin")
     password: str = os.environ.get("OTCS_PASSWORD")
     partition: str = os.environ.get("OTCS_PARTITION", "Content Server Members")
@@ -217,11 +224,13 @@ class CustomizerSettingsOTAWP:
     resource_name: str = "awp"
     access_role_name: str = "Access to " + resource_name
     admin: str = os.environ.get("OTAWP_ADMIN", "sysadmin")
-    password: str = os.environ.get("OTAWP_PASSWORD")
+    password: str = os.environ.get("OTCS_PASSWORD")
     public_protocol: str = os.environ.get("OTAWP_PROTOCOL", "https")
     public_url: str = os.environ.get("OTAWP_PUBLIC_URL")
     k8s_statefulset: str = "appworks"
     k8s_configmap: str = "appworks-config-ymls"
+    port: int = os.environ.get("OTAWP_SERVICE_PORT", 8080)
+    protocol: str = os.environ.get("OTPD_PROTOCOL", "http")
 
 
 @dataclass
@@ -262,6 +271,19 @@ class CustomizerSettingsAviator:
     enabled: bool = os.environ.get("AVIATOR_ENABLED", "false").lower() == "true"
 
 
+@dataclass
+class CustomizerSettingsAVTS:
+    """Class for Aviator Search (AVTS) related settings"""
+
+    enabled: bool = os.environ.get("AVTS_ENABLED", "false").lower() == "true"
+    otds_url = os.environ.get("AVTS_OTDS_URL", "")
+    client_id = os.environ.get("AVTS_CLIENT_ID", "")
+    client_secret = os.environ.get("AVTS_CLIENT_SECRET", "")
+    base_url = os.environ.get("AVTS_BASE_URL", "")
+    username = os.environ.get("AVTS_USERNAME", "")
+    password = os.environ.get("AVTS_PASSWORD", "")
+
+
 class Customizer:
     """Customizer Class to control the cusomization automation
 
@@ -281,6 +303,7 @@ class Customizer:
         m365: CustomizerSettingsM365 = CustomizerSettingsM365(),
         core_share: CustomizerSettingsCoreShare = CustomizerSettingsCoreShare(),
         aviator: CustomizerSettingsAviator = CustomizerSettingsAviator(),
+        avts: CustomizerSettingsAVTS = CustomizerSettingsAVTS(),
     ):
         self.settings = settings
 
@@ -314,6 +337,9 @@ class Customizer:
         # Aviator variables:
         self.aviator_settings = aviator
 
+        # Aviator Search variables:
+        self.avts_settings = avts
+
         # Initialize Objects for later assignment
         self.otds_object: OTDS | None = None
         self.otcs_object: OTCS | None = None
@@ -326,6 +352,7 @@ class Customizer:
         self.m365_object: M365 | None = None
         self.core_share_object: CoreShare | None = None
         self.browser_automation_object: BrowserAutomation | None = None
+        self.otawp_object: OTAWP | None = None
 
     # end initializer
 
@@ -613,7 +640,51 @@ class Customizer:
 
     # end method definition
 
-    def init_coreshare(self) -> M365:
+    def init_avts(self) -> AVTS:
+        """Initialize the Core Share object we use to talk to the Core Share API.
+
+        Args:
+            None
+        Returns:
+            object: CoreShare object or None if the object couldn't be created or
+                    the authentication fails.
+        """
+
+        logger.info(
+            "Aviator Search Base URL             = %s", self.avts_settings.base_url
+        )
+        logger.info(
+            "Aviator Search OTDS URL             = %s", self.avts_settings.otds_url
+        )
+        logger.info(
+            "Aviator Search Client ID            = %s", self.avts_settings.client_id
+        )
+        logger.debug(
+            "Aviator Search Client Secret        = %s",
+            self.avts_settings.client_secret,
+        )
+        logger.info(
+            "Aviator Search User ID              = %s", self.avts_settings.username
+        )
+        logger.debug(
+            "Aviator Search User Password        = %s",
+            self.avts_settings.password,
+        )
+
+        avts_object = AVTS(
+            otds_url=self.avts_settings.otds_url,
+            base_url=self.avts_settings.base_url,
+            client_id=self.avts_settings.client_id,
+            client_secret=self.avts_settings.client_secret,
+            username=self.avts_settings.username,
+            password=self.avts_settings.password,
+        )
+
+        return avts_object
+
+    # end method definition
+
+    def init_coreshare(self) -> CoreShare:
         """Initialize the Core Share object we use to talk to the Core Share API.
 
         Args:
@@ -772,6 +843,7 @@ class Customizer:
             username=self.otds_settings.username,
             password=self.otds_settings.password,
             otds_ticket=self.otds_settings.otds_ticket,
+            bindPassword=self.otds_settings.bindPassword
         )
 
         logger.info("Authenticating to OTDS...")
@@ -921,6 +993,10 @@ class Customizer:
             "OTCS K8s Backend Pods      = %s",
             self.otcs_settings.k8s_statefulset_backend,
         )
+        logger.info(
+            "FEME URI                   = %s",
+            self.otcs_settings.feme_uri,
+        )
 
         logger.debug("Checking if OTCS object has already been initialized")
 
@@ -938,6 +1014,7 @@ class Customizer:
             resource_name,
             otds_ticket=otds_ticket,
             base_path=self.otcs_settings.base_path,
+            feme_uri=self.otcs_settings.feme_uri,
         )
 
         # It is important to wait for OTCS to be configured - otherwise we
@@ -1164,7 +1241,7 @@ class Customizer:
         awp_resource = self.otds_object.get_resource(self.otawp_settings.resource_name)
         if not awp_resource:
             logger.info(
-                "OTDS resource -> %s for AppWorks Platform does not yet exist. Creating...",
+                "OTDS resource -> '%s' for AppWorks Platform does not yet exist. Creating...",
                 self.otawp_settings.resource_name,
             )
             # Create a Python dict with the special payload we need for AppWorks:
@@ -1377,10 +1454,10 @@ class Customizer:
             ]
 
             awp_resource = self.otds_object.add_resource(
-                self.otawp_settings.resource_name,
-                "AppWorks Platform",
-                "AppWorks Platform",
-                additional_payload,
+                name=self.otawp_settings.resource_name,
+                description="AppWorks Platform",
+                display_name="AppWorks Platform",
+                additional_payload=additional_payload,
             )
         else:
             logger.info(
@@ -1559,6 +1636,15 @@ class Customizer:
                             self.otawp_settings.product_name,
                             "USERS",
                         )
+        otawp_object = OTAWP(
+            self.otawp_settings.protocol,
+            self.otawp_settings.k8s_statefulset,
+            str(self.otawp_settings.port),
+            "sysadmin",
+            self.otawp_settings.password,
+            "",
+        )
+        return otawp_object
 
     # end method definition
 
@@ -1585,14 +1671,20 @@ class Customizer:
 
             logger.info("Deactivate Liveness probe for pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "touch /tmp/keepalive"]
+                pod_name,
+                ["/bin/sh", "-c", "touch /tmp/keepalive"],
+                container="otcs-frontend-container",
             )
             logger.info("Restarting pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "/opt/opentext/cs/stop_csserver"]
+                pod_name,
+                ["/bin/sh", "-c", "/opt/opentext/cs/stop_csserver"],
+                container="otcs-frontend-container",
             )
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "/opt/opentext/cs/start_csserver"]
+                pod_name,
+                ["/bin/sh", "-c", "/opt/opentext/cs/start_csserver"],
+                container="otcs-frontend-container",
             )
 
         # Restart all backends:
@@ -1601,14 +1693,20 @@ class Customizer:
 
             logger.info("Deactivate Liveness probe for pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "touch /tmp/keepalive"]
+                pod_name,
+                ["/bin/sh", "-c", "touch /tmp/keepalive"],
+                container="otcs-admin-container",
             )
             logger.info("Restarting pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "/opt/opentext/cs/stop_csserver"]
+                pod_name,
+                ["/bin/sh", "-c", "/opt/opentext/cs/stop_csserver"],
+                container="otcs-admin-container",
             )
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "/opt/opentext/cs/start_csserver"]
+                pod_name,
+                ["/bin/sh", "-c", "/opt/opentext/cs/start_csserver"],
+                container="otcs-admin-container",
             )
 
         logger.info("Re-Authenticating to OTCS after restart of pods...")
@@ -1625,7 +1723,9 @@ class Customizer:
 
             logger.info("Reactivate Liveness probe for pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "rm /tmp/keepalive"]
+                pod_name,
+                ["/bin/sh", "-c", "rm /tmp/keepalive"],
+                container="otcs-frontend-container",
             )
 
         for x in range(0, self.otcs_settings.replicas_backend):
@@ -1633,7 +1733,9 @@ class Customizer:
 
             logger.info("Reactivate Liveness probe for pod -> '%s'", pod_name)
             self.k8s_object.exec_pod_command(
-                pod_name, ["/bin/sh", "-c", "rm /tmp/keepalive"]
+                pod_name,
+                ["/bin/sh", "-c", "rm /tmp/keepalive"],
+                container="otcs-admin-container",
             )
 
         logger.info("Restart OTCS frontend and backend pods has been completed.")
@@ -1822,7 +1924,7 @@ class Customizer:
             self.log_header("Initialize OTAWP")
 
             # Configure required OTDS resources as AppWorks doesn't do this on its own:
-            self.init_otawp()
+            self.otawp_object = self.init_otawp()
         else:
             self.settings.placeholder_values["OTAWP_RESOURCE_ID"] = ""
 
@@ -1898,6 +2000,15 @@ class Customizer:
                 logger.error("Failed to initialize Microsoft 365!")
                 sys.exit()
 
+        if self.avts_settings.enabled:
+            self.log_header("Initialize Aviator Search")
+            self.avts_object = self.init_avts()
+            if not self.avts_object:
+                logger.error("Failed to initialize Aviator Search")
+                sys.exit()
+        else:
+            self.avts_object = None
+
         self.log_header("Processing Payload")
 
         cust_payload_list = []
@@ -1914,7 +2025,9 @@ class Customizer:
 
         # do we have additional payload as an external file?
         if os.path.exists(self.settings.cust_payload_external):
-            for filename in os.scandir(self.settings.cust_payload_external):
+            for filename in sorted(
+                os.scandir(self.settings.cust_payload_external), key=lambda e: e.name
+            ):
                 if filename.is_file() and os.path.getsize(filename) > 0:
                     logger.info("Found external payload file -> '%s'", filename.path)
                     cust_payload_list.append(filename.path)
@@ -1948,6 +2061,8 @@ class Customizer:
                 stop_on_error=self.settings.stop_on_error,
                 aviator_enabled=self.aviator_settings.enabled,
                 upload_status_files=self.otcs_settings.upload_status_files,
+                otawp_object=self.otawp_object,
+                avts_object=self.avts_object,
             )
             # Load the payload file and initialize the payload sections:
             if not payload_object.init_payload():
@@ -2101,4 +2216,30 @@ class Customizer:
             )
         )
 
-    # end method definition
+
+if __name__ == "__main__":
+    logging.basicConfig(
+        format="%(asctime)s %(levelname)s [%(name)s] %(message)s",
+        datefmt="%d-%b-%Y %H:%M:%S",
+        level=logging.INFO,
+        handlers=[
+            logging.StreamHandler(sys.stdout),
+        ],
+    )
+
+    my_customizer = Customizer(
+        otcs=CustomizerSettingsOTCS(
+            hostname="otcs.local.xecm.cloud",
+            hostname_backend="otcs-admin-0",
+            hostname_frontend="otcs-frontend",
+            protocol="http",
+            port_backend=8080,
+        ),
+        otds=CustomizerSettingsOTDS(hostname="otds"),
+        otpd=CustomizerSettingsOTPD(enabled=False),
+        otac=CustomizerSettingsOTAC(enabled=False),
+        k8s=CustomizerSettingsK8S(enabled=True),
+        otiv=CustomizerSettingsOTIV(enabled=False),
+    )
+
+    my_customizer.customization_run()

pyxecm/customizer/k8s.py

@@ -154,7 +154,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to get Pod -> %s; error -> %s", pod_name, str(exception)
+                "Failed to get Pod -> '%s'; error -> %s", pod_name, str(exception)
             )
             return None
 
@@ -189,7 +189,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to list Pods with field_selector -> %s and label_selector -> %s; error -> %s",
+                "Failed to list Pods with field_selector -> '%s' and label_selector -> '%s'; error -> %s",
                 field_selector,
                 label_selector,
                 str(exception),
@@ -223,13 +223,13 @@ class K8s:
                 for cond in pod_status.status.conditions:
                     if cond.type == condition_name and cond.status == "True":
                         logger.info(
-                            "Pod -> %s is in state -> %s!", pod_name, condition_name
+                            "Pod -> '%s' is in state -> '%s'!", pod_name, condition_name
                         )
                         ready = True
                         break
                 else:
                     logger.info(
-                        "Pod -> %s is not yet in state -> %s. Waiting...",
+                        "Pod -> '%s' is not yet in state -> '%s'. Waiting...",
                         pod_name,
                         condition_name,
                     )
@@ -238,7 +238,7 @@ class K8s:
 
             except ApiException as exception:
                 logger.error(
-                    "Failed to wait for pod -> %s; error -> %s",
+                    "Failed to wait for pod -> '%s'; error -> %s",
                     pod_name,
                     str(exception),
                 )
@@ -246,7 +246,12 @@ class K8s:
     # end method definition
 
     def exec_pod_command(
-        self, pod_name: str, command: list, max_retry: int = 3, time_retry: int = 10
+        self,
+        pod_name: str,
+        command: list,
+        max_retry: int = 3,
+        time_retry: int = 10,
+        container: str | None = None,
     ):
         """Execute a command inside a Kubernetes Pod (similar to kubectl exec on command line).
             See: https://github.com/kubernetes-client/python/blob/master/kubernetes/docs/CoreV1Api.md#connect_get_namespaced_pod_exec
@@ -261,9 +266,9 @@ class K8s:
 
         pod = self.get_pod(pod_name)
         if not pod:
-            logger.error("Pod -> %s does not exist", pod_name)
+            logger.error("Pod -> '%s' does not exist", pod_name)
 
-        logger.debug("Execute command -> %s in pod -> %s", command, pod_name)
+        logger.debug("Execute command -> %s in pod -> '%s'", command, pod_name)
 
         retry_counter = 1
 
@@ -274,6 +279,7 @@ class K8s:
                     pod_name,
                     self.get_namespace(),
                     command=command,
+                    container=container,
                     stderr=True,
                     stdin=False,
                     stdout=True,
@@ -283,7 +289,7 @@ class K8s:
                 return response
             except ApiException as exc:
                 logger.warning(
-                    "Failed to execute command, retry (%s/%s) -> %s in pod -> %s; error -> %s",
+                    "Failed to execute command, retry (%s/%s) -> %s in pod -> '%s'; error -> %s",
                     retry_counter,
                     max_retry,
                     command,
@@ -297,7 +303,7 @@ class K8s:
                 continue
 
         logger.error(
-            "Failed to execute command with %s retries -> %s in pod -> %s; error -> %s",
+            "Failed to execute command with %s retries -> %s in pod -> '%s'; error -> %s",
             max_retry,
             command,
             pod_name,
@@ -360,7 +366,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to execute command -> %s in pod -> %s; error -> %s",
+                "Failed to execute command -> %s in pod -> '%s'; error -> %s",
                 command,
                 pod_name,
                 str(exception),
@@ -381,7 +387,7 @@ class K8s:
                 got_response = True
             if commands:
                 command = commands.pop(0)
-                logger.debug("Execute command -> %s in pod -> %s", command, pod_name)
+                logger.debug("Execute command -> %s in pod -> '%s'", command, pod_name)
                 response.write_stdin(command + "\n")
             else:
                 # We continue as long as we get some response during timeout period
@@ -422,7 +428,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to delete Pod -> %s; error -> %s", pod_name, str(exception)
+                "Failed to delete Pod -> '%s'; error -> %s", pod_name, str(exception)
             )
             return None
 
@@ -456,7 +462,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to get Config Map -> %s; error -> %s",
+                "Failed to get Config Map -> '%s'; error -> %s",
                 config_map_name,
                 str(exception),
             )
@@ -493,7 +499,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to list Config Maps with field_selector -> %s and label_selector -> %s; error -> %s",
+                "Failed to list Config Maps with field_selector -> '%s' and label_selector -> '%s'; error -> %s",
                 field_selector,
                 label_selector,
                 str(exception),
@@ -521,7 +527,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to find Config Map -> %s; error -> %s",
+                "Failed to find Config Map -> '%s'; error -> %s",
                 config_map_name,
                 str(exception),
             )
@@ -556,7 +562,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to replace Config Map -> %s; error -> %s",
+                "Failed to replace Config Map -> '%s'; error -> %s",
                 config_map_name,
                 str(exception),
             )
@@ -583,7 +589,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to get Stateful Set -> %s; error -> %s",
+                "Failed to get Stateful Set -> '%s'; error -> %s",
                 sts_name,
                 str(exception),
             )
@@ -610,7 +616,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to get scaling (replicas) of Stateful Set -> %s; error -> %s",
+                "Failed to get scaling (replicas) of Stateful Set -> '%s'; error -> %s",
                 sts_name,
                 str(exception),
             )
@@ -638,7 +644,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to patch Stateful Set -> %s with -> %s; error -> %s",
+                "Failed to patch Stateful Set -> '%s' with -> %s; error -> %s",
                 sts_name,
                 sts_body,
                 str(exception),
@@ -667,7 +673,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to scale Stateful Set -> %s to -> %s replicas; error -> %s",
+                "Failed to scale Stateful Set -> '%s' to -> %s replicas; error -> %s",
                 sts_name,
                 scale,
                 str(exception),
@@ -695,7 +701,9 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to get Service -> %s; error -> %s", service_name, str(exception)
+                "Failed to get Service -> '%s'; error -> %s",
+                service_name,
+                str(exception),
             )
             return None
 
@@ -731,7 +739,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to list Services with field_selector -> %s and label_selector -> %s; error -> %s",
+                "Failed to list Services with field_selector -> '%s' and label_selector -> '%s'; error -> %s",
                 field_selector,
                 label_selector,
                 str(exception),
@@ -762,7 +770,7 @@ class K8s:
             )
         except ApiException as exception:
             logger.error(
-                "Failed to patch Service -> %s with -> %s; error -> %s",
+                "Failed to patch Service -> '%s' with -> %s; error -> %s",
                 service_name,
                 service_body,
                 str(exception),
@@ -925,4 +933,110 @@ class K8s:
 
         return self.patch_ingress(ingress_name, body)
 
-    # end method definition
+    def verify_pod_status(
+        self,
+        pod_name: str,
+        timeout: int = 1200,
+        total_containers: int = 1,
+        ready_containers: int = 1,
+        retry_interval: int = 30,
+    ) -> bool:
+        """
+        Verifies if a pod is in a 'Ready' state by checking the status of its containers.
+
+        This function waits for a Kubernetes pod to reach the 'Ready' state, where a specified number
+        of containers are ready. It checks the pod status at regular intervals and reports the status
+        using logs. If the pod does not reach the 'Ready' state within the specified timeout,
+        it returns `False`.
+
+        Args:
+            pod_name (str): The name of the pod to check the status for.
+            timeout (int, optional): The maximum time (in seconds) to wait for the pod to become ready. Defaults to 1200.
+            total_containers (int, optional): The total number of containers expected to be running in the pod. Defaults to 1.
+            ready_containers (int, optional): The minimum number of containers that need to be in a ready state. Defaults to 1.
+            retry_interval (int, optional): Time interval (in seconds) between each retry to check pod readiness. Defaults to 30.
+
+        Returns:
+            bool: Returns `True` if the pod reaches the 'Ready' state with the specified number of containers ready
+            within the timeout. Otherwise, returns `False`.
+        """
+
+        def wait_for_pod_ready(pod_name: str, timeout: int) -> bool:
+            """
+            Waits until the pod is in the 'Ready' state with the specified number of containers ready.
+
+            This internal function repeatedly checks the readiness of the pod, logging the
+            status of the containers. If the pod does not exist, it retries after waiting
+            and logs detailed information at each step.
+
+            Args:
+                pod_name (str): The name of the pod to check the status for.
+                timeout (int): The maximum time (in seconds) to wait for the pod to become ready.
+
+            Returns:
+                bool: Returns `True` if the pod is ready with the specified number of containers in a 'Ready' state.
+                Otherwise, returns `False`.
+            """
+            elapsed_time = 0  # Initialize elapsed time
+
+            while elapsed_time < timeout:
+                pod = self.get_pod(pod_name)
+
+                if not pod:
+                    logger.error(
+                        "Pod -> %s does not exist, waiting 300 seconds to retry.",
+                        pod_name,
+                    )
+                    time.sleep(300)
+                    pod = self.get_pod(pod_name)
+
+                if not pod:
+                    logger.error(
+                        "Pod -> %s still does not exist after retry!", pod_name
+                    )
+                    return False
+
+                # Get the ready status of containers
+                container_statuses = pod.status.container_statuses
+                if container_statuses and all(
+                    container.ready for container in container_statuses
+                ):
+                    current_ready_containers = sum(
+                        1 for c in container_statuses if c.ready
+                    )
+                    total_containers_in_pod = len(container_statuses)
+
+                    if (
+                        current_ready_containers >= ready_containers
+                        and total_containers_in_pod == total_containers
+                    ):
+                        logger.info(
+                            "Pod -> %s is ready with %d/%d containers.",
+                            pod_name,
+                            current_ready_containers,
+                            total_containers_in_pod,
+                        )
+                        return True
+                    else:
+                        logger.debug(
+                            "Pod -> %s is not yet ready (%d/%d).",
+                            pod_name,
+                            current_ready_containers,
+                            total_containers_in_pod,
+                        )
+                else:
+                    logger.debug("Pod -> %s is not yet ready.", pod_name)
+
+                logger.info(
+                    f"Waiting {retry_interval} seconds before next pod status check."
+                )
+                time.sleep(
+                    retry_interval
+                )  # Sleep for the retry interval before checking again
+                elapsed_time += retry_interval
+
+            logger.error("Pod -> %s is not ready after %d seconds.", pod_name, timeout)
+            return False
+
+        # Wait until the pod is ready
+        return wait_for_pod_ready(pod_name, timeout)