kaqing 2.0.12__tar.gz → 2.0.13__tar.gz

{kaqing-2.0.12 → kaqing-2.0.13}/PKG-INFO

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

{kaqing-2.0.12 → kaqing-2.0.13}/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'

{kaqing-2.0.12 → kaqing-2.0.13}/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):

{kaqing-2.0.12 → kaqing-2.0.13}/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
 

{kaqing-2.0.12 → kaqing-2.0.13}/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")

{kaqing-2.0.12 → kaqing-2.0.13}/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",

{kaqing-2.0.12 → kaqing-2.0.13}/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']

kaqing-2.0.13/adam/version.py

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

{kaqing-2.0.12 → kaqing-2.0.13}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.12 → kaqing-2.0.13}/setup.py

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

kaqing-2.0.12/adam/version.py

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