kaqing 1.98.140__py3-none-any.whl → 2.0.1__py3-none-any.whl

adam/commands/deploy/undeploy_pod.py

@@ -34,15 +34,20 @@ class UndeployPod(Command):
         if not self.validate_state(state):
             return state
 
-        if KubeContext.in_cluster():
-            log2('This is doable only from outside of the Kubernetes cluster.')
-            return state
-
         label_selector = Config().get('pod.label-selector', 'run=ops')
-        ServiceAccounts.delete(state.namespace, label_selector=label_selector)
-        Deployments.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
+        try:
+            ServiceAccounts.delete(state.namespace, label_selector=label_selector)
+        except Exception as e:
+            log2(e)
+        try:
+            Deployments.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
+        except Exception as e:
+            log2(e)
         # instantly destroy the pod
-        Pods.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
+        try:
+            Pods.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
+        except Exception as e:
+            log2(e)
         undeploy_frontend(state.namespace, label_selector)
 
         return state

adam/k8s_utils/deployment.py

@@ -1,36 +1,9 @@
-from collections.abc import Callable
-from concurrent.futures import ThreadPoolExecutor, as_completed
-import sys
-import time
-from typing import TypeVar, cast
 from kubernetes import client
-from kubernetes.stream import stream
-from kubernetes.stream.ws_client import ERROR_CHANNEL
 
-from adam.config import Config
 from adam.k8s_utils.pods import Pods
-from adam.pod_exec_result import PodExecResult
-from adam.utils import elapsed_time, log2
-from .kube_context import KubeContext
-
-T = TypeVar('T')
-_TEST_POD_EXEC_OUTS: PodExecResult = None
 
 # utility collection on deployments; methods are all static
 class Deployments:
-    def set_test_pod_exec_outs(outs: PodExecResult):
-        global _TEST_POD_EXEC_OUTS
-        _TEST_POD_EXEC_OUTS = outs
-
-        return _TEST_POD_EXEC_OUTS
-
-    def delete(pod_name: str, namespace: str):
-        try:
-            v1 = client.CoreV1Api()
-            api_response = v1.delete_namespaced_pod(pod_name, namespace)
-        except Exception as e:
-            log2("Exception when calling CoreV1Api->delete_namespaced_pod: %s\n" % e)
-
     def delete_with_selector(namespace: str, label_selector: str, grace_period_seconds: int = None):
         v1 = client.AppsV1Api()
 
@@ -38,134 +11,6 @@ class Deployments:
         for i in ret.items:
             v1.delete_namespaced_deployment(name=i.metadata.name, namespace=namespace, grace_period_seconds=grace_period_seconds)
 
-    def on_pods(pods: list[str],
-                namespace: str,
-                body: Callable[[ThreadPoolExecutor, str, str, bool], T],
-                post: Callable[[T], T] = None,
-                action: str = 'action', max_workers=0, show_out=True) -> list[T]:
-        show_out = KubeContext.show_out(show_out)
-
-        if not max_workers:
-            max_workers = Config().action_workers(action, 0)
-        if max_workers > 0:
-            # if parallel, node sampling is suppressed
-            if KubeContext.show_parallelism():
-                log2(f'Executing on all nodes from statefulset in parallel...')
-            start_time = time.time()
-            try:
-                with ThreadPoolExecutor(max_workers=max_workers) as executor:
-                    # disable stdout from the pod_exec, then show the output in a for loop
-                    futures = [body(executor, pod, namespace, show_out) for pod in pods]
-                    if len(futures) == 0:
-                        return cast(list[T], [])
-
-                rs = [future.result() for future in as_completed(futures)]
-                if post:
-                    rs = [post(r, show_out=show_out) for r in rs]
-
-                return rs
-            finally:
-                if KubeContext.show_parallelism():
-                    log2(f"Parallel {action} elapsed time: {elapsed_time(start_time)} with {max_workers} workers")
-        else:
-            results: list[T] = []
-
-            samples = Config().action_node_samples(action, sys.maxsize)
-            l = min(len(pods), samples)
-            adj = 'all'
-            if l < len(pods):
-                adj = f'{l} sample'
-            if show_out:
-                log2(f'Executing on {adj} nodes from statefulset...')
-            for pod_name in pods:
-                try:
-                    result = body(None, pod_name, namespace, show_out)
-                    if post:
-                        result = post(result, show_out=show_out)
-                    results.append(result)
-                    if result:
-                        l -= 1
-                        if not l:
-                            break
-                except Exception as e:
-                    log2(e)
-
-            return results
-
-    def exec(pod_name: str, container: str, namespace: str, command: str, show_out = True, throw_err = False, interaction: Callable[[any, list[str]], any] = None):
-        if _TEST_POD_EXEC_OUTS:
-            return _TEST_POD_EXEC_OUTS
-
-        show_out = KubeContext.show_out(show_out)
-
-        api = client.CoreV1Api()
-
-        exec_command = ["/bin/sh", "-c", command]
-        k_command = f'kubectl exec {pod_name} -c {container} -n {namespace} -- {command}'
-        if show_out:
-            print(k_command)
-
-        resp = stream(
-            api.connect_get_namespaced_pod_exec,
-            pod_name,
-            namespace,
-            command=exec_command,
-            container=container,
-            stderr=True,
-            stdin=True,
-            stdout=True,
-            tty=True,
-            _preload_content=False,
-        )
-
-        stdout = []
-        stderr = []
-        error_output = None
-        try:
-            while resp.is_open():
-                resp.update(timeout=1)
-                if resp.peek_stdout():
-                    frag = resp.read_stdout()
-                    stdout.append(frag)
-                    if show_out: print(frag, end="")
-
-                    if interaction:
-                        interaction(resp, stdout)
-                if resp.peek_stderr():
-                    frag = resp.read_stderr()
-                    stderr.append(frag)
-                    if show_out: print(frag, end="")
-
-            try:
-                # get the exit code from server
-                error_output = resp.read_channel(ERROR_CHANNEL)
-            except Exception:
-                pass
-        except Exception as e:
-            if throw_err:
-                raise e
-            else:
-                log2(e)
-        finally:
-            resp.close()
-
-        return PodExecResult("".join(stdout), "".join(stderr), k_command, error_output)
-
-    def get_container(namespace: str, pod_name: str, container_name: str):
-        pod = Pods.get(namespace, pod_name)
-        if not pod:
-            return None
-
-        for container in pod.spec.containers:
-            if container_name == container.name:
-                return container
-
-        return None
-
-    def get(namespace: str, pod_name: str):
-        v1 = client.CoreV1Api()
-        return v1.read_namespaced_pod(name=pod_name, namespace=namespace)
-
     def create_deployment_spec(name: str, image: str, image_pull_secret: str,
                                envs: list, container_security_context: client.V1SecurityContext,
                                volume_name: str, pvc_name:str, mount_path:str,
@@ -202,18 +47,4 @@ class Deployments:
                 name=deployment_name,
                 labels=labels
             ))
-        )
-
-    def wait_for_running(namespace: str, pod_name: str, msg: str=None):
-        msged = False
-
-        while Pods.get(namespace, pod_name).status.phase != 'Running':
-            if not msged:
-                if not msg:
-                    msg = f'Waiting for the {pod_name} pod to start up...'
-                log2(msg)
-                msged = True
-            time.sleep(5)
-
-    def completed(namespace: str, pod_name: str):
-        return Pods.get(namespace, pod_name).status.phase in ['Succeeded', 'Failed']
+        )

adam/version.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "1.98.140"  #: the working version
+__version__ = "2.0.1"  #: the working version
 __release__ = "1.0.0"  #: the release version

{kaqing-1.98.140.dist-info → kaqing-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaqing
-Version: 1.98.140
+Version: 2.0.1
 Summary: UNKNOWN
 Home-page: UNKNOWN
 License: UNKNOWN

{kaqing-1.98.140.dist-info → kaqing-2.0.1.dist-info}/RECORD

@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=ionPWjPhzrzm59zbhO1WsGGcLVba3bnPl6uPjvQ4C34,4093
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=QarrUAwYWOz3YTemtaf2opbHLa5a3LEsyuonNwhvOhk,7131
 adam/utils.py,sha256=j7p7iruLuV11swa0z9ZLBgoJHu_nkTSVKtQe0q71gmk,7025
-adam/version.py,sha256=aHmraJ9rwWAccgp_8uuEZLVAOkQ32VkuKXEpe6zSLEA,141
+adam/version.py,sha256=LGSXrWr8-Nw59OeemDBaeRL_DEXmvkmNpfaRTFS_h10,138
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -87,7 +87,7 @@ adam/commands/deploy/deploy_pod.py,sha256=IaDmrxpYw_YqkK599Vq4N7_4tINq5ihBlccVPE
 adam/commands/deploy/deploy_utils.py,sha256=-YB-XUwr8zVsf9HKYWx_TP-dB2WgOpEmUGyYNcoie0U,1046
 adam/commands/deploy/undeploy.py,sha256=CNgbB00TR1YRgX0xGgdGAT8YNPlcLssMsRX-pSby-Ao,1842
 adam/commands/deploy/undeploy_frontend.py,sha256=mbHlWb5UHUVpR1trfflCS_TDip7eAqxqoZ47RzRZcno,1257
-adam/commands/deploy/undeploy_pod.py,sha256=Notj7_MNU-sHxulJPnWKi1QUDUE8cWArZZEko8hKw3A,1901
+adam/commands/deploy/undeploy_pod.py,sha256=n3AQ9EQ1TUPTzUVwWeyRLiK4dlnF_Zpq3nPEzrjSwjM,1962
 adam/commands/medusa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/medusa/medusa.py,sha256=Y_yyOZRb6u45wfTVBRp3kuklyYDTSlaAJQdAiymP_8M,2185
 adam/commands/medusa/medusa_backup.py,sha256=j4DTVWFT-4rzs4gG_pBvjE-JuPsVCJIsnyQjIzJ4EbA,1801
@@ -137,7 +137,7 @@ adam/k8s_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/k8s_utils/cassandra_clusters.py,sha256=9gUn31SsyW32asSFM8cKdkDSw5LYqPY2Iv0r4fDg_fU,2017
 adam/k8s_utils/cassandra_nodes.py,sha256=jQlaxIQKnavvsXH7lMM8WPriusp7KO698UygytIA8Xw,1134
 adam/k8s_utils/custom_resources.py,sha256=cIeaZRQET2DelTGU2f5QsMckh7TddPpWZDFeNK3txeQ,7647
-adam/k8s_utils/deployment.py,sha256=ai5DwdU0y6s6i0jmOKnfydbXSfZZCkG3f-XTf7P7-64,8504
+adam/k8s_utils/deployment.py,sha256=Jw1To66E-DGY8dPbphWYakevNndKvv5nXtSEx23aqp0,2505
 adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3460
 adam/k8s_utils/jobs.py,sha256=P7j3JiZ33TRnkjkPLLrGlypAPxK1BZQHvVpF8s7eHA8,2604
 adam/k8s_utils/kube_context.py,sha256=nocEyVNjXWG-N-GNnEYHDvnot7H5LQUFmpZIwIyE7As,3310
@@ -157,8 +157,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-1.98.140.dist-info/METADATA,sha256=6GDFpkMOLNGQdRq63lPYleF-ifTzXW_GVOO9d4tBywI,134
-kaqing-1.98.140.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-1.98.140.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-1.98.140.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-1.98.140.dist-info/RECORD,,
+kaqing-2.0.1.dist-info/METADATA,sha256=xfAMlT42lHrPoIH8DRfW0iXkfwfg_vjygQ2maAOVW8A,131
+kaqing-2.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.1.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.1.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.1.dist-info/RECORD,,