kaqing 1.98.140__tar.gz → 2.0.1__tar.gz

{kaqing-1.98.140 → kaqing-2.0.1}/PKG-INFO

@@ -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 → kaqing-2.0.1}/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

kaqing-2.0.1/adam/k8s_utils/deployment.py

@@ -0,0 +1,50 @@
+from kubernetes import client
+
+from adam.k8s_utils.pods import Pods
+
+# utility collection on deployments; methods are all static
+class Deployments:
+    def delete_with_selector(namespace: str, label_selector: str, grace_period_seconds: int = None):
+        v1 = client.AppsV1Api()
+
+        ret = v1.list_namespaced_deployment(namespace=namespace, label_selector=label_selector)
+        for i in ret.items:
+            v1.delete_namespaced_deployment(name=i.metadata.name, namespace=namespace, grace_period_seconds=grace_period_seconds)
+
+    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,
+                               command: list[str]=None, sa_name=None, labels: dict[str, str] = {}):
+        return client.V1DeploymentSpec(
+            replicas=1,
+            selector=client.V1LabelSelector(match_labels=labels),
+            template=client.V1PodTemplateSpec(
+                metadata=client.V1ObjectMeta(labels=labels),
+                spec=Pods.create_pod_spec(name, image, image_pull_secret, envs, container_security_context,
+                                          volume_name, pvc_name, mount_path, command=command, sa_name=sa_name,
+                                          restart_policy="Always"),
+            ),
+        )
+
+    def create(namespace: str, deployment_name: str, image: str,
+               command: list[str] = None,
+               secret: str = None,
+               env: dict[str, any] = {},
+               container_security_context: client.V1SecurityContext = None,
+               labels: dict[str, str] = {},
+               volume_name: str = None,
+               pvc_name: str = None,
+               mount_path: str = None,
+               sa_name=None):
+        v1 = client.AppsV1Api()
+        envs = []
+        for k, v in env.items():
+            envs.append(client.V1EnvVar(name=str(k), value=str(v)))
+        deployment = Deployments.create_deployment_spec(deployment_name, image, secret, envs, container_security_context, volume_name, pvc_name, mount_path, command=command, sa_name=sa_name, labels=labels)
+        return v1.create_namespaced_deployment(
+            namespace=namespace,
+            body=client.V1Deployment(spec=deployment, metadata=client.V1ObjectMeta(
+                name=deployment_name,
+                labels=labels
+            ))
+        )

kaqing-2.0.1/adam/version.py

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

{kaqing-1.98.140 → kaqing-2.0.1}/kaqing.egg-info/PKG-INFO

@@ -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 → kaqing-2.0.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaqing',
-    version='1.98.140',
+    version='2.0.1',
     packages=find_packages(),
     entry_points={
         'console_scripts': [

kaqing-1.98.140/adam/k8s_utils/deployment.py

@@ -1,219 +0,0 @@
-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()
-
-        ret = v1.list_namespaced_deployment(namespace=namespace, label_selector=label_selector)
-        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,
-                               command: list[str]=None, sa_name=None, labels: dict[str, str] = {}):
-        return client.V1DeploymentSpec(
-            replicas=1,
-            selector=client.V1LabelSelector(match_labels=labels),
-            template=client.V1PodTemplateSpec(
-                metadata=client.V1ObjectMeta(labels=labels),
-                spec=Pods.create_pod_spec(name, image, image_pull_secret, envs, container_security_context,
-                                          volume_name, pvc_name, mount_path, command=command, sa_name=sa_name,
-                                          restart_policy="Always"),
-            ),
-        )
-
-    def create(namespace: str, deployment_name: str, image: str,
-               command: list[str] = None,
-               secret: str = None,
-               env: dict[str, any] = {},
-               container_security_context: client.V1SecurityContext = None,
-               labels: dict[str, str] = {},
-               volume_name: str = None,
-               pvc_name: str = None,
-               mount_path: str = None,
-               sa_name=None):
-        v1 = client.AppsV1Api()
-        envs = []
-        for k, v in env.items():
-            envs.append(client.V1EnvVar(name=str(k), value=str(v)))
-        deployment = Deployments.create_deployment_spec(deployment_name, image, secret, envs, container_security_context, volume_name, pvc_name, mount_path, command=command, sa_name=sa_name, labels=labels)
-        return v1.create_namespaced_deployment(
-            namespace=namespace,
-            body=client.V1Deployment(spec=deployment, metadata=client.V1ObjectMeta(
-                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']

kaqing-1.98.140/adam/version.py

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