kaqing 2.0.8__py3-none-any.whl → 2.0.10__py3-none-any.whl

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)
 

adam/commands/deploy/deploy_utils.py

@@ -1,24 +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)
-    Services.create_service(name, namespace, port, labels, labels=labels)
-    Ingresses.create_ingress(name, namespace, app_session.host, '/c3/c3/ops($|/)', port, annotations={
+    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)
+    }, 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)
+    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]}
+    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)

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

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)
 

adam/version.py

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

{kaqing-2.0.8.dist-info → kaqing-2.0.10.dist-info}/METADATA

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

{kaqing-2.0.8.dist-info → kaqing-2.0.10.dist-info}/RECORD

@@ -13,8 +13,8 @@ adam/repl.py,sha256=5uGsu24qVAfATHIRdLJ4er44_9uUnVZ14pr-VXCILI0,7224
 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=wRfIbHB9eMrf5I_6c3pqkkpPSm45S805cG6qTRtA2j4,138
+adam/utils.py,sha256=-O47UmVG8S5N2LHAOE-UTMBHJOS_mXufU8ncupeNCHc,7043
+adam/version.py,sha256=mdh9nkCtfE5P1TzFCTOQm8r-WNZbAQ4HdoCY0lVpGQY,139
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -83,11 +83,11 @@ adam/commands/deploy/code_stop.py,sha256=ch7ZMgosvTHsGaIcDwQY5XYh_5HYrUjBkZFOI-d
 adam/commands/deploy/code_utils.py,sha256=5Gp4U8HzKpPkbkHDU7whlvGOK-wWaAbCIIGzVoN9hio,3296
 adam/commands/deploy/deploy.py,sha256=_y_pSBHIEVMTgjDqEZwvmGfLQBirHBH4sCnsl0CKOM8,1792
 adam/commands/deploy/deploy_frontend.py,sha256=TSvMTy6uUfOBIV96hKFy-M1hNCE6OeRW9M_dj1ZJsv0,1700
-adam/commands/deploy/deploy_pod.py,sha256=q6Cugc9SzRgztbX4kBkFxbmwXiDzXxYfrxput7H4zeA,3640
-adam/commands/deploy/deploy_utils.py,sha256=-YB-XUwr8zVsf9HKYWx_TP-dB2WgOpEmUGyYNcoie0U,1046
+adam/commands/deploy/deploy_pod.py,sha256=epK2FSnO4jqm7VHNID6gETvlhOs9CWVlTj1I_htDA_g,4403
+adam/commands/deploy/deploy_utils.py,sha256=daJhX2kCg5aGt4ZLQdz5AbR-AS7q2y-bZNVxHzP708c,1524
 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=l4QWhY334Gv6F8It-vCvd834n3q_9dzdmgHl2NLKOIw,2153
+adam/commands/deploy/undeploy_pod.py,sha256=k4O0JuVsY4h2jT_mZPM6Q8GqfSz02VAQLAYmd0FCVT8,1901
 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
@@ -158,8 +158,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-2.0.8.dist-info/METADATA,sha256=34Td1SBx3DwsoBuKcikKDfndm57exILg-1o4ZLPbvVQ,131
-kaqing-2.0.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.8.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.8.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.8.dist-info/RECORD,,
+kaqing-2.0.10.dist-info/METADATA,sha256=cyvtgygs4hoOrrjd_CvFT7NvAJKxu0F6G_taMWsdcv4,132
+kaqing-2.0.10.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.10.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.10.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.10.dist-info/RECORD,,