kaqing 2.0.24__tar.gz → 2.0.26__tar.gz

{kaqing-2.0.24 → kaqing-2.0.26}/PKG-INFO

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

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/deploy.py

@@ -30,7 +30,7 @@ class Deploy(Command):
         state, args = self.apply_state(args, state)
 
         if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Deploy.cmd_list()], separator=':'))
+            log(lines_to_tabular([c.help(ReplState()) for c in Deploy.cmd_list()], separator='\t'))
 
             return 'command-missing'
         else:
@@ -58,4 +58,4 @@ class DeployCommandHelper(click.Command):
         log()
         log('Sub-Commands:')
 
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Deploy.COMMAND} ', '  ', 1) for c in Deploy.cmd_list()], separator=':'))
+        log(lines_to_tabular([c.help(ReplState()).replace(f'{Deploy.COMMAND} ', '  ', 1) for c in Deploy.cmd_list()], separator='\t'))

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/deploy_frontend.py

@@ -49,4 +49,4 @@ class DeployFrontend(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{DeployFrontend.COMMAND}\t deploy frontend'
+        return f'{DeployFrontend.COMMAND}\t deploy Web frontend'

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/deploy_pg_agent.py

@@ -35,4 +35,4 @@ class DeployPgAgent(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{DeployPgAgent.COMMAND}\t deploy postgres agent'
+        return f'{DeployPgAgent.COMMAND}\t deploy Postgres agent'

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/deploy_pod.py

@@ -106,4 +106,4 @@ class DeployPod(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{DeployPod.COMMAND}\t deploy pod'
+        return f'{DeployPod.COMMAND}\t deploy Ops pod'

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/undeploy.py

@@ -30,7 +30,7 @@ class Undeploy(Command):
         state, args = self.apply_state(args, state)
 
         if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Undeploy.cmd_list()], separator=':'))
+            log(lines_to_tabular([c.help(ReplState()) for c in Undeploy.cmd_list()], separator='\t'))
 
             return 'command-missing'
         else:
@@ -58,4 +58,4 @@ class UndeployCommandHelper(click.Command):
         log()
         log('Sub-Commands:')
 
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Undeploy.COMMAND} ', '  ', 1) for c in Undeploy.cmd_list()], separator=':'))
+        log(lines_to_tabular([c.help(ReplState()).replace(f'{Undeploy.COMMAND} ', '  ', 1) for c in Undeploy.cmd_list()], separator='\t'))

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/undeploy_frontend.py

@@ -38,4 +38,4 @@ class UndeployFrontend(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{UndeployFrontend.COMMAND}\t undeploy frontend'
+        return f'{UndeployFrontend.COMMAND}\t undeploy Web frontend'

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/undeploy_pg_agent.py

@@ -38,4 +38,4 @@ class UndeployPgAgent(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{UndeployPgAgent.COMMAND}\t undeploy postgres agent'
+        return f'{UndeployPgAgent.COMMAND}\t undeploy Postgres agent'

{kaqing-2.0.24 → kaqing-2.0.26}/adam/commands/deploy/undeploy_pod.py

@@ -46,4 +46,4 @@ class UndeployPod(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{UndeployPod.COMMAND}\t undeploy pod'
+        return f'{UndeployPod.COMMAND}\t undeploy Ops pod'

{kaqing-2.0.24 → kaqing-2.0.26}/adam/k8s_utils/pods.py

@@ -236,14 +236,29 @@ class Pods:
     def wait_for_running(namespace: str, pod_name: str, msg: str=None, label_selector: str = None):
         msged = False
 
-        while (Pods.get_with_selector(namespace, label_selector) if label_selector else 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, nl=False)
-                msged = True
-            time.sleep(5)
-        log2(' OK')
+        cnt = 2
+        while (cnt < 302 and Pods.get_with_selector(namespace, label_selector) if label_selector else Pods.get(namespace, pod_name)).status.phase != 'Running':
+            if not msg:
+                msg = f'Waiting for the {pod_name} pod to start up.'
+
+            max_len = len(msg) + 3
+            mod = cnt % 3
+            padded = ''
+            if mod == 0:
+                padded = f'\r{msg}'.ljust(max_len)
+            elif mod == 1:
+                padded = f'\r{msg}.'.ljust(max_len)
+            else:
+                padded = f'\r{msg}..'.ljust(max_len)
+            log2(padded, nl=False)
+            cnt += 1
+            time.sleep(1)
+
+        log2(f'\r{msg}..'.ljust(max_len), nl=False)
+        if cnt < 300:
+            log2(' OK')
+        else:
+            log2(' Timed Out')
 
     def completed(namespace: str, pod_name: str):
         return Pods.get(namespace, pod_name).status.phase in ['Succeeded', 'Failed']

kaqing-2.0.26/adam/version.py

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

{kaqing-2.0.24 → kaqing-2.0.26}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.24 → kaqing-2.0.26}/setup.py

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

kaqing-2.0.24/adam/version.py

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