kaqing 2.0.24__py3-none-any.whl → 2.0.26__py3-none-any.whl

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'))

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'

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'

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'

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'))

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'

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'

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'

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']

adam/version.py

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

{kaqing-2.0.24.dist-info → kaqing-2.0.26.dist-info}/METADATA

@@ -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.dist-info → kaqing-2.0.26.dist-info}/RECORD

@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=h5l-xLfB85qiaU71yyunhoTy2743zsC4ElQ0ZvHqo_k,4259
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=QarrUAwYWOz3YTemtaf2opbHLa5a3LEsyuonNwhvOhk,7131
 adam/utils.py,sha256=-O47UmVG8S5N2LHAOE-UTMBHJOS_mXufU8ncupeNCHc,7043
-adam/version.py,sha256=VYuAy_f-suQyp9mvLegExpTTQ34kOo4KICEl8MfjzkU,139
+adam/version.py,sha256=jQjSL1L2HiuimPuBBox_LoqX997GYKbhlZ-Z5cHVELE,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
@@ -81,15 +81,15 @@ adam/commands/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 adam/commands/deploy/code_start.py,sha256=-iH8HThTNM83IfBxT_LqTByuHVatV9d-Il4OYOfrwLI,1370
 adam/commands/deploy/code_stop.py,sha256=ch7ZMgosvTHsGaIcDwQY5XYh_5HYrUjBkZFOI-d2gOU,1696
 adam/commands/deploy/code_utils.py,sha256=5Gp4U8HzKpPkbkHDU7whlvGOK-wWaAbCIIGzVoN9hio,3296
-adam/commands/deploy/deploy.py,sha256=R1m_bM81WU9X1YJJz9gkT5u8JMPDzPaYUDBm9PXscJQ,1872
-adam/commands/deploy/deploy_frontend.py,sha256=TSvMTy6uUfOBIV96hKFy-M1hNCE6OeRW9M_dj1ZJsv0,1700
-adam/commands/deploy/deploy_pg_agent.py,sha256=4FXltht0oA4DJDVq902gjCm06wo_abuHabOstOgWEgU,1203
-adam/commands/deploy/deploy_pod.py,sha256=epK2FSnO4jqm7VHNID6gETvlhOs9CWVlTj1I_htDA_g,4403
+adam/commands/deploy/deploy.py,sha256=Yy333-bEyTkB0-U5Qb4SXh_QGVUFngrPy99ROPWzn1Q,1874
+adam/commands/deploy/deploy_frontend.py,sha256=S3SvJD4JZQ9kDOOP_mrTnZFDl54AHhio5xxNgIUBZVk,1704
+adam/commands/deploy/deploy_pg_agent.py,sha256=VlOplID4MBABzuXeueyjKOTZjlQlQWLwvLSxpii4FHU,1203
+adam/commands/deploy/deploy_pod.py,sha256=6MgR1YLssOU4IjXPiqIM7btAKrceeumEeAg-HjzZLWM,4407
 adam/commands/deploy/deploy_utils.py,sha256=daJhX2kCg5aGt4ZLQdz5AbR-AS7q2y-bZNVxHzP708c,1524
-adam/commands/deploy/undeploy.py,sha256=mKywl7mHDoxRjWTx1Wo3PS_T8W6ibJBzXk_dEmEQ9bY,1928
-adam/commands/deploy/undeploy_frontend.py,sha256=mbHlWb5UHUVpR1trfflCS_TDip7eAqxqoZ47RzRZcno,1257
-adam/commands/deploy/undeploy_pg_agent.py,sha256=zES4rhrhFdfZ53-ZRyKt4EcIEg0zJlffXAMfgHWi4Xw,1319
-adam/commands/deploy/undeploy_pod.py,sha256=k4O0JuVsY4h2jT_mZPM6Q8GqfSz02VAQLAYmd0FCVT8,1901
+adam/commands/deploy/undeploy.py,sha256=HDPFSYTOAmSc11OmgKBxq64S4lqyEC8zL1q69CVDlLQ,1930
+adam/commands/deploy/undeploy_frontend.py,sha256=gHekPn7l19JgVbhneKpQ7ModNoDFmzWRMyQv9v4FBxo,1261
+adam/commands/deploy/undeploy_pg_agent.py,sha256=RYME8no1FT94WpVg-HXDGL1NmLlpE1I9R4htitjaxpo,1319
+adam/commands/deploy/undeploy_pod.py,sha256=hTcL8cAh7xYPcSm9sgiVFCxPh3SskefBfTmla310oUA,1905
 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
@@ -144,7 +144,7 @@ adam/k8s_utils/deployment.py,sha256=3oZPfPgQfqtAQaxEFL4daUfRSieRAhysmuaWMzUYgXk,
 adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3460
 adam/k8s_utils/jobs.py,sha256=gJpBpjcZ_FlkWJJIlavbHC_bqdmvv-GMVo8UZVh0sOQ,2610
 adam/k8s_utils/kube_context.py,sha256=nocEyVNjXWG-N-GNnEYHDvnot7H5LQUFmpZIwIyE7As,3310
-adam/k8s_utils/pods.py,sha256=uCrdgwNv86GiRBFmX40qjXOVtsXv0Hi9OiF5Vd05vO0,10004
+adam/k8s_utils/pods.py,sha256=g374JUo1t_3kKmcMCCorOmc_z9EgRjvMoeABoX8Ja7I,10425
 adam/k8s_utils/secrets.py,sha256=pYaVKXTpx3-QgFtBjznWFq0N6ZcBdxnx21FRe5nBCCo,2305
 adam/k8s_utils/service_accounts.py,sha256=v2oQSqCrNvt2uRnKlNwR3fjtpUG7oF5nqgzEB7NnT-U,6349
 adam/k8s_utils/services.py,sha256=EOJJGACVbbRvu5T3rMKqIJqgYic1_MSJ17EA0TJ6UOk,3156
@@ -160,8 +160,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.24.dist-info/METADATA,sha256=H6CxKyLb1Ux_-e6eI5BnCqhDeuP0oChDXF5jj9LqSYQ,132
-kaqing-2.0.24.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.24.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.24.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.24.dist-info/RECORD,,
+kaqing-2.0.26.dist-info/METADATA,sha256=nbIOeVQe32kEX4II0IH1WYwQHz97Q6v0Q0vficvtEvM,132
+kaqing-2.0.26.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.26.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.26.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.26.dist-info/RECORD,,