kaqing 2.0.12__py3-none-any.whl → 2.0.14__py3-none-any.whl

adam/commands/deploy/deploy_pg_agent.py

@@ -1,18 +1,7 @@
-from kubernetes import client
-import yaml
-
 from adam.commands.command import Command
-from adam.commands.deploy.deploy_utils import creating, deploy_frontend, gen_labels
 from adam.commands.postgres.postgres_session import PostgresSession
 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.k8s_utils.volumes import ConfigMapMount
 from adam.repl_state import ReplState, RequiredState
-from adam.utils import log2
 
 class DeployPgAgent(Command):
     COMMAND = 'deploy pg-agent'

adam/commands/deploy/undeploy_pg_agent.py

@@ -1,11 +1,6 @@
 from adam.commands.command import Command
-from adam.commands.deploy.deploy_utils import undeploy_frontend, deleting
 from adam.commands.postgres.postgres_session import PostgresSession
 from adam.config import Config
-from adam.k8s_utils.config_maps import ConfigMaps
-from adam.k8s_utils.deployment import Deployments
-from adam.k8s_utils.pods import Pods
-from adam.k8s_utils.service_accounts import ServiceAccounts
 from adam.repl_state import ReplState, RequiredState
 
 class UndeployPgAgent(Command):

adam/commands/postgres/postgres_preview.py

@@ -1,5 +1,4 @@
 from adam.commands.command import Command
-from adam.commands.ls import Ls
 from adam.commands.preview_table import PreviewTable
 from adam.repl_state import ReplState, RequiredState
 

adam/commands/repair/repair_scan.py

@@ -55,12 +55,7 @@ class RepairScan(Command):
             else:
                 log2("Exception when calling BatchV1Apii->create_namespaced_job: %s\n" % e)
 
-        msged = False
-        while Pods.get(ns, pod_name).status.phase != 'Running':
-            if not msged:
-                log2("Waiting for the scanner pod to start up...")
-                msged = True
-            time.sleep(5)
+        Pods.wait_for_running(ns, pod_name, 'Waiting for the scanner pod to start up...')
 
         try:
             Pods.exec(pod_name, pod_name, ns, f"find {log_path} -type f -mtime -{n} -print0 | xargs -0 grep failed")

adam/k8s_utils/jobs.py

@@ -12,7 +12,7 @@ class Jobs:
             envs.append(client.V1EnvVar(name=k.upper(), value=str(v)))
         for k, v in env_from.items():
             envs.append(client.V1EnvVar(name=k.upper(), value_from=client.V1EnvVarSource(secret_key_ref=client.V1SecretKeySelector(key=k, name=v))))
-        template = Pods.create_pod_spec(job_name, image, image_pull_secret, envs, volume_name, pvc_name, mount_path, command)
+        template = Pods.create_pod_spec(job_name, image, image_pull_secret, envs, None, volume_name, pvc_name, mount_path, command)
         spec = client.V1JobSpec(template=client.V1PodTemplateSpec(spec=template), backoff_limit=1, ttl_seconds_after_finished=300)
         job = client.V1Job(
             api_version="batch/v1",

adam/k8s_utils/pods.py

@@ -240,9 +240,10 @@ class Pods:
             if not msged:
                 if not msg:
                     msg = f'Waiting for the {pod_name} pod to start up...'
-                log2(msg)
+                log2(msg, nl=False)
                 msged = True
             time.sleep(5)
+        log2(' OK')
 
     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.12"  #: the working version
+__version__ = "2.0.14"  #: the working version
 __release__ = "1.0.0"  #: the release version

{kaqing-2.0.12.dist-info → kaqing-2.0.14.dist-info}/METADATA

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

{kaqing-2.0.12.dist-info → kaqing-2.0.14.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=jHnDnqIeuutPIOLc0hrOnkwI4wj7JxIIQ0zgmOj2fcI,139
+adam/version.py,sha256=aSu27o0oRx-R-xHex5CU-AmHdzdUoZ93QiS9e7UEtuA,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,12 +83,12 @@ 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=R1m_bM81WU9X1YJJz9gkT5u8JMPDzPaYUDBm9PXscJQ,1872
 adam/commands/deploy/deploy_frontend.py,sha256=TSvMTy6uUfOBIV96hKFy-M1hNCE6OeRW9M_dj1ZJsv0,1700
-adam/commands/deploy/deploy_pg_agent.py,sha256=07kzg44ujiOtRgH1Pw6Fu5hAYZ_BNPLIA5ZRKViaVI8,1657
+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_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=2QyJrJKE_ma0YuK-oP7FoAagTabd0bvdFhSvkL1iN5k,1510
+adam/commands/deploy/undeploy_pg_agent.py,sha256=uWa804XTTvZzozDSH_4loxHqSSeWXobdoBSQPDFX3vw,1239
 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
@@ -99,7 +99,7 @@ adam/commands/medusa/medusa_show_restorejobs.py,sha256=vEYlsM28XjeodeH1E3826sliu
 adam/commands/postgres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/postgres/postgres.py,sha256=ugnQulU6h3pSySYRwU801raxqsC8W5DcFLSbqnk7SPo,3597
 adam/commands/postgres/postgres_ls.py,sha256=HwZTgwGKXUqHX33S8aQPF6FqCrLqtoz4cLyJV2SpoE0,1186
-adam/commands/postgres/postgres_preview.py,sha256=OhnWe6SKf2Z8rBW7_NJEvJFlLqPUKMr528VPVtoT0yw,1306
+adam/commands/postgres/postgres_preview.py,sha256=MLzdEc4mvNj6V1Q8jO5OPznXyYELJHgd35_eQgLlNIU,1274
 adam/commands/postgres/postgres_session.py,sha256=QFHSmixaI9_MxgzYj-UwvaOOaHLudx1bp821LB0dSSw,9440
 adam/commands/reaper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/reaper/reaper.py,sha256=SbxXgJ6b4wdXx5a1Fps71iEa1hmycWbArh1oC5bS83M,2677
@@ -119,7 +119,7 @@ adam/commands/repair/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 adam/commands/repair/repair.py,sha256=5jdKVpP03GYNPuqeGlidOcFLTwl9gIzVDbxgXtUjAjw,2100
 adam/commands/repair/repair_log.py,sha256=c7TI9hblpqn1tn7lTxj7VkIQKdNigYIIX-nxiFRZkns,1159
 adam/commands/repair/repair_run.py,sha256=C9F86ia46rBCwkP8BFM5nw-AJ05jm4Bx9wnMnyZXR04,2598
-adam/commands/repair/repair_scan.py,sha256=aVVnfX2qVuhrMjrXEnuaMN0_Ik8yljfV8VAjOIPhXfY,2583
+adam/commands/repair/repair_scan.py,sha256=m6PErrbuQgryCMm_2pbGAwQdKNQvXLahcHXFfNKoU-s,2439
 adam/commands/repair/repair_stop.py,sha256=on3jHmOwtWOL7SJlFd8ryBflzqDsxwJNwtAbhDjYUNc,1193
 adam/commands/show/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/show/show.py,sha256=7dAsliNuDz6QNM24RoWJgKhJf_nuQTugp715vZ8hxh0,2509
@@ -142,9 +142,9 @@ adam/k8s_utils/config_maps.py,sha256=vc9A-2D1-1mindCMFL1wuysDOXb0RCl4BdjC6B6usXI
 adam/k8s_utils/custom_resources.py,sha256=cIeaZRQET2DelTGU2f5QsMckh7TddPpWZDFeNK3txeQ,7647
 adam/k8s_utils/deployment.py,sha256=3oZPfPgQfqtAQaxEFL4daUfRSieRAhysmuaWMzUYgXk,2921
 adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3460
-adam/k8s_utils/jobs.py,sha256=P7j3JiZ33TRnkjkPLLrGlypAPxK1BZQHvVpF8s7eHA8,2604
+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=BmBi74N4Meq6uKoU7v4A1nQK8Jk4mo5CaRz2mAVoCbU,9974
+adam/k8s_utils/pods.py,sha256=uCrdgwNv86GiRBFmX40qjXOVtsXv0Hi9OiF5Vd05vO0,10004
 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.12.dist-info/METADATA,sha256=5rXLoc5r_XuBINVjNE36MiClmIOcXqJ8bMJj7IWOmck,132
-kaqing-2.0.12.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.12.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.12.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.12.dist-info/RECORD,,
+kaqing-2.0.14.dist-info/METADATA,sha256=NpddnKNVxG7EkLsGnS05cFkf2IsvaPKzemttBPynn_0,132
+kaqing-2.0.14.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.14.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.14.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.14.dist-info/RECORD,,