kaqing 2.0.8__tar.gz → 2.0.9__tar.gz

{kaqing-2.0.8 → kaqing-2.0.9}/PKG-INFO

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

{kaqing-2.0.8 → kaqing-2.0.9}/adam/commands/deploy/deploy_pod.py

@@ -2,7 +2,7 @@ from kubernetes import client
 import yaml
 
 from adam.commands.command import Command
-from adam.commands.deploy.deploy_utils import deploy_frontend, gen_labels
+from adam.commands.deploy.deploy_utils import creating, deploy_frontend, gen_labels
 from adam.config import Config
 from adam.k8s_utils.config_maps import ConfigMaps
 from adam.k8s_utils.deployment import Deployments
@@ -48,7 +48,11 @@ class DeployPod(Command):
         additional_cluster_roles = Config().get('pod.sa.additional-cluster-roles', 'c3aiops-k8ssandra-operator').split(',')
         label_selector = Config().get('pod.label-selector', 'run=ops')
         labels = gen_labels(label_selector)
-        ServiceAccounts.replicate(sa_name, state.namespace, sa_proto, labels=labels, add_cluster_roles=additional_cluster_roles)
+
+        creating('service account', lambda: ServiceAccounts.replicate(sa_name,
+                                                                      state.namespace,
+                                                                      sa_proto, labels=labels,
+                                                                      add_cluster_roles=additional_cluster_roles))
 
         settings_filename = 'settings.yaml'
         settings_path = f'/kaqing/{settings_filename}'
@@ -68,9 +72,13 @@ class DeployPod(Command):
             return state
 
         cm_name = Config().get('pod.cm.name', 'ops')
-        ConfigMaps.create(cm_name, state.namespace, {
+        map_data = {
             settings_filename : settings_data
-        }, labels=labels)
+        }
+        creating('config map', lambda: ConfigMaps.create(cm_name,
+                                                         state.namespace,
+                                                         map_data,
+                                                         labels=labels))
 
         pod_name = Config().get('pod.name', 'ops')
         image = Config().get('pod.image', 'seanahnsf/kaqing')
@@ -79,11 +87,14 @@ class DeployPod(Command):
                 add=["SYS_PTRACE"]
             )
         )
-        Deployments.create(state.namespace, pod_name, image,
-                           env={'NAMESPACE': state.namespace},
-                           container_security_context=security_context,
-                           labels=labels, sa_name=sa_name,
-                           config_map_mount=ConfigMapMount(cm_name, settings_filename, settings_path))
+        creating('deployment', lambda: Deployments.create(state.namespace,
+                                                  pod_name,
+                                                  image,
+                                                  env={'NAMESPACE': state.namespace},
+                                                  container_security_context=security_context,
+                                                  labels=labels,
+                                                  sa_name=sa_name,
+                                                  config_map_mount=ConfigMapMount(cm_name, settings_filename, settings_path)))
 
         uri = deploy_frontend(pod_name, state.namespace, label_selector)
 

kaqing-2.0.9/adam/commands/deploy/deploy_utils.py

@@ -0,0 +1,39 @@
+from typing import Callable
+from adam.app_session import AppSession
+from adam.k8s_utils.ingresses import Ingresses
+from adam.k8s_utils.services import Services
+from adam.utils import log2
+
+def deploy_frontend(name: str, namespace: str, label_selector: str):
+    app_session: AppSession = AppSession.create('c3', 'c3', namespace)
+    port = 7678
+    labels = gen_labels(label_selector)
+    creating('service', lambda: Services.create_service(name, namespace, port, labels, labels=labels))
+    creating('ingress', lambda: Ingresses.create_ingress(name, namespace, app_session.host, '/c3/c3/ops($|/)', port, annotations={
+        'kubernetes.io/ingress.class': 'nginx',
+        'nginx.ingress.kubernetes.io/use-regex': 'true',
+        'nginx.ingress.kubernetes.io/rewrite-target': '/'
+    }, labels=labels))
+
+    return f'https://{app_session.host}/c3/c3/ops'
+
+def undeploy_frontend(namespace: str, label_selector: str):
+    deleting('ingress', lambda: Ingresses.delete_ingresses(namespace, label_selector=label_selector))
+    deleting('service', lambda: Services.delete_services(namespace, label_selector=label_selector))
+
+def gen_labels(label_selector: str):
+    kv = label_selector.split('=')
+    return {kv[0]: kv[1]}
+
+def creating(name: str, body: Callable[[], None]):
+    log2(f'Creating {name}...', nl=False)
+    body()
+    log2(' OK')
+
+def deleting(name: str, body: Callable[[], None]):
+    try:
+        log2(f'Deleting {name}...', nl=False)
+        body()
+        log2(' OK')
+    except Exception as e:
+        log2(e)

{kaqing-2.0.8 → kaqing-2.0.9}/adam/commands/deploy/undeploy_pod.py

@@ -1,13 +1,11 @@
 from adam.commands.command import Command
-from adam.commands.deploy.deploy_utils import undeploy_frontend
+from adam.commands.deploy.deploy_utils import undeploy_frontend, deleting
 from adam.config import Config
 from adam.k8s_utils.config_maps import ConfigMaps
 from adam.k8s_utils.deployment import Deployments
-from adam.k8s_utils.kube_context import KubeContext
 from adam.k8s_utils.pods import Pods
 from adam.k8s_utils.service_accounts import ServiceAccounts
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
 
 class UndeployPod(Command):
     COMMAND = 'undeploy pod'
@@ -36,23 +34,10 @@ class UndeployPod(Command):
             return state
 
         label_selector = Config().get('pod.label-selector', 'run=ops')
-        try:
-            ServiceAccounts.delete(state.namespace, label_selector=label_selector)
-        except Exception as e:
-            log2(e)
-        try:
-            ConfigMaps.delete_with_selector(state.namespace, 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
-        try:
-            Pods.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
-        except Exception as e:
-            log2(e)
+        deleting('service account', lambda: ServiceAccounts.delete(state.namespace, label_selector=label_selector))
+        deleting('config map', lambda: ConfigMaps.delete_with_selector(state.namespace, label_selector))
+        deleting('deployment', lambda: Deployments.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0))
+        deleting('pod', lambda: Pods.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0))
         undeploy_frontend(state.namespace, label_selector)
 
         return state

{kaqing-2.0.8 → kaqing-2.0.9}/adam/utils.py

@@ -76,9 +76,9 @@ def log(s = None):
     else:
         click.echo(s)
 
-def log2(s = None):
+def log2(s = None, nl = True):
     if s:
-        click.echo(s, err=True)
+        click.echo(s, err=True, nl=nl)
     else:
         print(file=sys.stderr)
 

kaqing-2.0.9/adam/version.py

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

{kaqing-2.0.8 → kaqing-2.0.9}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.8 → kaqing-2.0.9}/setup.py

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

kaqing-2.0.8/adam/commands/deploy/deploy_utils.py

@@ -1,24 +0,0 @@
-from adam.app_session import AppSession
-from adam.k8s_utils.ingresses import Ingresses
-from adam.k8s_utils.services import Services
-
-def deploy_frontend(name: str, namespace: str, label_selector: str):
-    app_session: AppSession = AppSession.create('c3', 'c3', namespace)
-    port = 7678
-    labels = gen_labels(label_selector)
-    Services.create_service(name, namespace, port, labels, labels=labels)
-    Ingresses.create_ingress(name, namespace, app_session.host, '/c3/c3/ops($|/)', port, annotations={
-        'kubernetes.io/ingress.class': 'nginx',
-        'nginx.ingress.kubernetes.io/use-regex': 'true',
-        'nginx.ingress.kubernetes.io/rewrite-target': '/'
-    }, labels=labels)
-
-    return f'https://{app_session.host}/c3/c3/ops'
-
-def undeploy_frontend(namespace: str, label_selector: str):
-    Ingresses.delete_ingresses(namespace, label_selector=label_selector)
-    Services.delete_services(namespace, label_selector=label_selector)
-
-def gen_labels(label_selector: str):
-    kv = label_selector.split('=')
-    return {kv[0]: kv[1]}

kaqing-2.0.8/adam/version.py

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