kaqing 1.98.86__tar.gz → 1.98.88__tar.gz

{kaqing-1.98.86 → kaqing-1.98.88}/PKG-INFO

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

{kaqing-1.98.86 → kaqing-1.98.88}/adam/app_session.py

@@ -88,7 +88,7 @@ class AppSession:
         if not forced and self.app_login:
             return self.app_login
 
-        idp_login: IdpLogin = Idp.login(self.host, idp_uri=idp_uri, forced=forced, use_token_from_env=use_token_from_env, use_cached_creds=use_cached_creds)
+        idp_login: IdpLogin = Idp.login(self.host, idp_uri=idp_uri, forced=forced, use_token_from_env=use_token_from_env, use_cached_creds=use_cached_creds, verify=False)
         if not idp_login:
             log2(f"Invalid username/password.")
 

{kaqing-1.98.86 → kaqing-1.98.88}/adam/batch.py

@@ -6,8 +6,8 @@ from adam.commands.cp import ClipboardCopy, CopyCommandHelper
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterCommandHelper, ClusterOrPodCommandHelper, PodCommandHelper
 from adam.commands.cqlsh import CqlCommandHelper, Cqlsh
-from adam.commands.frontend.setup import Setup, SetupCommandHelper
-from adam.commands.frontend.teardown import TearDown, TearDownCommandHelper
+from adam.commands.deploy.deploy import Deploy, DeployCommandHelper
+from adam.commands.deploy.undeploy import Undeploy, UndeployCommandHelper
 from adam.commands.issues import Issues
 from adam.commands.login import Login
 from adam.commands.logs import Logs
@@ -77,6 +77,16 @@ def cql(kubeconfig: str, config: str, param: list[str], cluster: str, namespace:
     run_command(Cqlsh(), kubeconfig, config, param, cluster, namespace, pod, extra_args)
 
 
+@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=DeployCommandHelper, help='Setup.')
+@click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
+@click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
+@click.option('--param', '-v', multiple=True, metavar='<key>=<value>', help='parameter override')
+@click.option('--namespace', '-n', required=False, metavar='namespace', help='Kubernetes namespace')
+@click.argument('extra_args', nargs=-1, metavar='<pod>', type=click.UNPROCESSED)
+def deploy(kubeconfig: str, config: str, param: list[str], namespace: str, extra_args):
+    run_command(Deploy(), kubeconfig, config, param, None, namespace, None, extra_args)
+
+
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ClusterOrPodCommandHelper, help="Print Qing's issues.")
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
@@ -229,16 +239,6 @@ def rollout(kubeconfig: str, config: str, param: list[str], cluster: str, namesp
     run_command(RollOut(), kubeconfig, config, param, cluster, namespace, None, extra_args)
 
 
-@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=SetupCommandHelper, help='Setup.')
-@click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
-@click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
-@click.option('--param', '-v', multiple=True, metavar='<key>=<value>', help='parameter override')
-@click.option('--namespace', '-n', required=False, metavar='namespace', help='Kubernetes namespace')
-@click.argument('extra_args', nargs=-1, metavar='<pod>', type=click.UNPROCESSED)
-def setup(kubeconfig: str, config: str, param: list[str], namespace: str, extra_args):
-    run_command(Setup(), kubeconfig, config, param, None, namespace, None, extra_args)
-
-
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=ShowCommandHelper, help='Show configuration or kubectl commands.')
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
@@ -251,14 +251,14 @@ def show(kubeconfig: str, config: str, param: list[str], cluster: str, namespace
     run_command(Show(), kubeconfig, config, param, cluster, namespace, pod, extra_args)
 
 
-@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=TearDownCommandHelper, help='Teardown.')
+@cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=UndeployCommandHelper, help='Undeploy.')
 @click.option('--kubeconfig', '-k', required=False, metavar='path', help='path to kubeconfig file')
 @click.option('--config', default='params.yaml', metavar='path', help='path to kaqing parameters file')
 @click.option('--param', '-v', multiple=True, metavar='<key>=<value>', help='parameter override')
 @click.option('--namespace', '-n', required=False, metavar='namespace', help='Kubernetes namespace')
 @click.argument('extra_args', nargs=-1, metavar='<pod>', type=click.UNPROCESSED)
-def teardown(kubeconfig: str, config: str, param: list[str], namespace: str, extra_args):
-    run_command(TearDown(), kubeconfig, config, param, None, namespace, None, extra_args)
+def undeploy(kubeconfig: str, config: str, param: list[str], namespace: str, extra_args):
+    run_command(Undeploy(), kubeconfig, config, param, None, namespace, None, extra_args)
 
 
 @cli.command(context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=PodCommandHelper, help='Get cassandra log.')

{kaqing-1.98.86/adam/commands/frontend → kaqing-1.98.88/adam/commands/deploy}/code_start.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.frontend.code_utils import start_user_code, stop_user_codes
+from adam.commands.deploy.code_utils import start_user_code, stop_user_codes
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 

{kaqing-1.98.86/adam/commands/frontend → kaqing-1.98.88/adam/commands/deploy}/code_stop.py

@@ -1,5 +1,5 @@
 from adam.commands.command import Command
-from adam.commands.frontend.code_utils import stop_user_codes
+from adam.commands.deploy.code_utils import stop_user_codes
 from adam.repl_state import ReplState, RequiredState
 
 class CodeStop(Command):

kaqing-1.98.86/adam/commands/frontend/setup.py → kaqing-1.98.88/adam/commands/deploy/deploy.py

@@ -2,17 +2,18 @@ import click
 
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterCommandHelper
-from .setup_frontend import SetupFrontend
+from adam.commands.deploy.deploy_pod import DeployPod
+from .deploy_frontend import DeployFrontend
 from adam.repl_state import ReplState
 from adam.utils import lines_to_tabular, log, log2
 
-class Setup(Command):
-    COMMAND = 'setup'
+class Deploy(Command):
+    COMMAND = 'deploy'
     reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(Setup, cls).__new__(cls)
+        if not hasattr(cls, 'instance'): cls.instance = super(Deploy, cls).__new__(cls)
 
         return cls.instance
 
@@ -20,7 +21,7 @@ class Setup(Command):
         super().__init__(successor)
 
     def command(self):
-        return Setup.COMMAND
+        return Deploy.COMMAND
 
     def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
@@ -29,18 +30,18 @@ class Setup(Command):
         state, args = self.apply_state(args, state)
 
         if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in Setup.cmd_list()], separator=':'))
+            log(lines_to_tabular([c.help(ReplState()) for c in Deploy.cmd_list()], separator=':'))
 
             return 'command-missing'
         else:
             # head with the Chain of Responsibility pattern
-            cmds = Command.chain(Setup.cmd_list())
+            cmds = Command.chain(Deploy.cmd_list())
             if not cmds.run(cmd, state):
                 log2('* Command is missing.')
                 Command.display_help()
 
     def cmd_list():
-        return [SetupFrontend()]
+        return [DeployFrontend(), DeployPod()]
 
     def completion(self, state: ReplState):
         if state.sts:
@@ -51,10 +52,10 @@ class Setup(Command):
     def help(self, _: ReplState):
         return None
 
-class SetupCommandHelper(click.Command):
+class DeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
         log(super().get_help(ctx))
         log()
         log('Sub-Commands:')
 
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{Setup.COMMAND} ', '  ', 1) for c in Setup.cmd_list()], separator=':'))
+        log(lines_to_tabular([c.help(ReplState()).replace(f'{Deploy.COMMAND} ', '  ', 1) for c in Deploy.cmd_list()], separator=':'))

kaqing-1.98.86/adam/commands/frontend/setup_frontend.py → kaqing-1.98.88/adam/commands/deploy/deploy_frontend.py

@@ -1,16 +1,18 @@
 from adam.app_session import AppSession
 from adam.commands.command import Command
+from adam.commands.deploy.deploy_utils import deploy_frontend
+from adam.config import Config
 from adam.k8s_utils.ingresses import Ingresses
 from adam.k8s_utils.services import Services
 from adam.repl_state import ReplState, RequiredState
 from adam.utils import log2
 
-class SetupFrontend(Command):
-    COMMAND = 'setup frontend'
+class DeployFrontend(Command):
+    COMMAND = 'deploy frontend'
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(SetupFrontend, cls).__new__(cls)
+        if not hasattr(cls, 'instance'): cls.instance = super(DeployFrontend, cls).__new__(cls)
 
         return cls.instance
 
@@ -18,7 +20,7 @@ class SetupFrontend(Command):
         super().__init__(successor)
 
     def command(self):
-        return SetupFrontend.COMMAND
+        return DeployFrontend.COMMAND
 
     def required(self):
         return RequiredState.NAMESPACE
@@ -33,19 +35,13 @@ class SetupFrontend(Command):
 
         log2('This will support c3/c3 only for demo.')
 
-        app_session: AppSession = AppSession.create('c3', 'c3', state.namespace)
+        pod_name = Config().get('pod.name', 'ops')
+        label_selector = Config().get('pod.label-selector', 'run=ops')
         try:
-            name = 'ops'
-            port = 7678
-            Services.create_service(name, state.namespace, port, {"run": "ops"})
-            Ingresses.create_ingress(name, state.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': '/'
-            })
+            deploy_frontend(pod_name, state.namespace, label_selector)
         except Exception as e:
             if e.status == 409:
-                log2(f"Error: '{name}' already exists in namespace '{state.namespace}'.")
+                log2(f"Error: '{pod_name}' already exists in namespace '{state.namespace}'.")
             else:
                 log2(f"Error creating ingress or service: {e}")
 
@@ -55,4 +51,4 @@ class SetupFrontend(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{SetupFrontend.COMMAND}\t sets up frontend'
+        return f'{DeployFrontend.COMMAND}\t deploy frontend'

kaqing-1.98.88/adam/commands/deploy/deploy_pod.py

@@ -0,0 +1,68 @@
+from kubernetes import client
+
+from adam.commands.command import Command
+from adam.commands.deploy.deploy_utils import deploy_frontend, gen_labels
+from adam.config import Config
+from adam.k8s_utils.ingresses import Ingresses
+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.services import Services
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class DeployPod(Command):
+    COMMAND = 'deploy pod'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(DeployPod, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return DeployPod.COMMAND
+
+    def required(self):
+        return RequiredState.NAMESPACE
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+        if not self.validate_state(state):
+            return state
+
+        if KubeContext.in_cluster():
+            log2('This is doable only from outside of the Kubernetes cluster.')
+            return state
+
+        sa_name = Config().get('pod.sa.name', 'ops')
+        sa_proto = Config().get('pod.sa.proto', 'c3')
+        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)
+
+        pod_name = Config().get('pod.name', 'ops')
+        image = Config().get('pod.image', 'seanahnsf/kaqing')
+        security_context = client.V1SecurityContext(
+            capabilities=client.V1Capabilities(
+                add=["SYS_PTRACE"]
+            )
+        )
+        Pods.create(state.namespace, pod_name, image, env={'NAMESPACE': state.namespace}, container_security_context=security_context, labels=labels, sa_name=sa_name)
+
+        deploy_frontend(pod_name, state.namespace, label_selector)
+
+        return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{DeployPod.COMMAND}\t deploy pod'

kaqing-1.98.88/adam/commands/deploy/deploy_utils.py

@@ -0,0 +1,26 @@
+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)
+    # Services.create_service(name, namespace, port, {"run": "ops"})
+    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)
+
+    log2(f'Ops pod is available at 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)
+
+def gen_labels(label_selector: str):
+    kv = label_selector.split('=')
+    return {kv[0]: kv[1]}

kaqing-1.98.86/adam/commands/frontend/teardown.py → kaqing-1.98.88/adam/commands/deploy/undeploy.py

@@ -2,18 +2,19 @@ import click
 
 from adam.commands.command import Command
 from adam.commands.command_helpers import ClusterCommandHelper
-from adam.commands.frontend.teardown_frontend import TearDownFrontend
-from .setup_frontend import SetupFrontend
+from adam.commands.deploy.undeploy_frontend import UndeployFrontend
+from adam.commands.deploy.undeploy_pod import UndeployPod
+from .deploy_frontend import DeployFrontend
 from adam.repl_state import ReplState
 from adam.utils import lines_to_tabular, log, log2
 
-class TearDown(Command):
-    COMMAND = 'teardown'
+class Undeploy(Command):
+    COMMAND = 'undeploy'
     reaper_login = None
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(TearDown, cls).__new__(cls)
+        if not hasattr(cls, 'instance'): cls.instance = super(Undeploy, cls).__new__(cls)
 
         return cls.instance
 
@@ -21,7 +22,7 @@ class TearDown(Command):
         super().__init__(successor)
 
     def command(self):
-        return TearDown.COMMAND
+        return Undeploy.COMMAND
 
     def run(self, cmd: str, state: ReplState):
         if not(args := self.args(cmd)):
@@ -30,18 +31,18 @@ class TearDown(Command):
         state, args = self.apply_state(args, state)
 
         if state.in_repl:
-            log(lines_to_tabular([c.help(ReplState()) for c in TearDown.cmd_list()], separator=':'))
+            log(lines_to_tabular([c.help(ReplState()) for c in Undeploy.cmd_list()], separator=':'))
 
             return 'command-missing'
         else:
             # head with the Chain of Responsibility pattern
-            cmds = Command.chain(TearDown.cmd_list())
+            cmds = Command.chain(Undeploy.cmd_list())
             if not cmds.run(cmd, state):
                 log2('* Command is missing.')
                 Command.display_help()
 
     def cmd_list():
-        return [TearDownFrontend()]
+        return [UndeployFrontend(), UndeployPod()]
 
     def completion(self, state: ReplState):
         if state.sts:
@@ -52,10 +53,10 @@ class TearDown(Command):
     def help(self, _: ReplState):
         return None
 
-class TearDownCommandHelper(click.Command):
+class UndeployCommandHelper(click.Command):
     def get_help(self, ctx: click.Context):
         log(super().get_help(ctx))
         log()
         log('Sub-Commands:')
 
-        log(lines_to_tabular([c.help(ReplState()).replace(f'{TearDown.COMMAND} ', '  ', 1) for c in TearDown.cmd_list()], separator=':'))
+        log(lines_to_tabular([c.help(ReplState()).replace(f'{Undeploy.COMMAND} ', '  ', 1) for c in Undeploy.cmd_list()], separator=':'))

kaqing-1.98.86/adam/commands/frontend/teardown_frontend.py → kaqing-1.98.88/adam/commands/deploy/undeploy_frontend.py

@@ -1,14 +1,16 @@
 from adam.commands.command import Command
+from adam.commands.deploy.deploy_utils import undeploy_frontend
+from adam.config import Config
 from adam.k8s_utils.ingresses import Ingresses
 from adam.k8s_utils.services import Services
 from adam.repl_state import ReplState, RequiredState
 
-class TearDownFrontend(Command):
-    COMMAND = 'teardown frontend'
+class UndeployFrontend(Command):
+    COMMAND = 'undeploy frontend'
 
     # the singleton pattern
     def __new__(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'): cls.instance = super(TearDownFrontend, cls).__new__(cls)
+        if not hasattr(cls, 'instance'): cls.instance = super(UndeployFrontend, cls).__new__(cls)
 
         return cls.instance
 
@@ -16,7 +18,7 @@ class TearDownFrontend(Command):
         super().__init__(successor)
 
     def command(self):
-        return TearDownFrontend.COMMAND
+        return UndeployFrontend.COMMAND
 
     def required(self):
         return RequiredState.NAMESPACE
@@ -29,9 +31,8 @@ class TearDownFrontend(Command):
         if not self.validate_state(state):
             return state
 
-        name = 'ops'
-        Ingresses.delete_ingress(name, state.namespace)
-        Services.delete_service(name, state.namespace)
+        label_selector = Config().get('pod.label-selector', 'run=ops')
+        undeploy_frontend(state.namespace, label_selector)
 
         return state
 
@@ -39,4 +40,4 @@ class TearDownFrontend(Command):
         return super().completion(state)
 
     def help(self, _: ReplState):
-        return f'{TearDownFrontend.COMMAND}\t tear down frontend'
+        return f'{UndeployFrontend.COMMAND}\t undeploy frontend'

kaqing-1.98.88/adam/commands/deploy/undeploy_pod.py

@@ -0,0 +1,54 @@
+from adam.app_session import AppSession
+from adam.commands.command import Command
+from adam.commands.deploy.deploy_utils import deploy_frontend, undeploy_frontend
+from adam.config import Config
+from adam.k8s_utils.ingresses import Ingresses
+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.services import Services
+from adam.repl_state import ReplState, RequiredState
+from adam.utils import log2
+
+class UndeployPod(Command):
+    COMMAND = 'undeploy pod'
+
+    # the singleton pattern
+    def __new__(cls, *args, **kwargs):
+        if not hasattr(cls, 'instance'): cls.instance = super(UndeployPod, cls).__new__(cls)
+
+        return cls.instance
+
+    def __init__(self, successor: Command=None):
+        super().__init__(successor)
+
+    def command(self):
+        return UndeployPod.COMMAND
+
+    def required(self):
+        return RequiredState.NAMESPACE
+
+    def run(self, cmd: str, state: ReplState):
+        if not(args := self.args(cmd)):
+            return super().run(cmd, state)
+
+        state, args = self.apply_state(args, state)
+        if not self.validate_state(state):
+            return state
+
+        if KubeContext.in_cluster():
+            log2('This is doable only from outside of the Kubernetes cluster.')
+            return state
+
+        label_selector = Config().get('pod.label-selector', 'run=ops')
+        undeploy_frontend(state.namespace, label_selector)
+        Pods.delete_with_selector(state.namespace, label_selector)
+        ServiceAccounts.delete(state.namespace, label_selector=label_selector)
+
+        return state
+
+    def completion(self, state: ReplState):
+        return super().completion(state)
+
+    def help(self, _: ReplState):
+        return f'{UndeployPod.COMMAND}\t undeploy pod'

{kaqing-1.98.86 → kaqing-1.98.88}/adam/commands/postgres/postgres_session.py

@@ -93,23 +93,23 @@ class PostgresSession:
         #  template1                             | postgres | UTF8     | en_US.UTF-8 | en_US.UTF-8 |            | libc            | =c/postgres          +
         #                                        |          |          |             |             |            |                 | postgres=CTc/postgres
         # (48 rows)
-        r = self.run_sql('\l', show_out=False)
-        s = 0
-        for line in r.stdout.split('\n'):
-            line: str = line.strip(' \r')
-            if s == 0:
-                if 'List of databases' in line:
-                    s = 1
-            elif s == 1:
-                if 'Name' in line and 'Owner' in line and 'Encoding' in line:
-                    s = 2
-            elif s == 2:
-                if line.startswith('---------'):
-                    s = 3
-            elif s == 3:
-                groups = re.match(r'^\s*(\S*)\s*\|\s*(\S*)\s*\|.*', line)
-                if groups and groups[1] != '|':
-                    dbs.append({'name': groups[1], 'owner': groups[2]})
+        if r := self.run_sql('\l', show_out=False):
+            s = 0
+            for line in r.stdout.split('\n'):
+                line: str = line.strip(' \r')
+                if s == 0:
+                    if 'List of databases' in line:
+                        s = 1
+                elif s == 1:
+                    if 'Name' in line and 'Owner' in line and 'Encoding' in line:
+                        s = 2
+                elif s == 2:
+                    if line.startswith('---------'):
+                        s = 3
+                elif s == 3:
+                    groups = re.match(r'^\s*(\S*)\s*\|\s*(\S*)\s*\|.*', line)
+                    if groups and groups[1] != '|':
+                        dbs.append({'name': groups[1], 'owner': groups[2]})
 
         return dbs
 
@@ -120,23 +120,23 @@ class PostgresSession:
         # ----------+------------------------------------------------------------+-------+---------------
         #  postgres | c3_2_admin_aclpriv                                         | table | postgres
         #  postgres | c3_2_admin_aclpriv_a                                       | table | postgres
-        r = self.run_sql('\dt', show_out=False)
-        s = 0
-        for line in r.stdout.split('\n'):
-            line: str = line.strip(' \r')
-            if s == 0:
-                if 'List of relations' in line:
-                    s = 1
-            elif s == 1:
-                if 'Schema' in line and 'Name' in line and 'Type' in line:
-                    s = 2
-            elif s == 2:
-                if line.startswith('---------'):
-                    s = 3
-            elif s == 3:
-                groups = re.match(r'^\s*(\S*)\s*\|\s*(\S*)\s*\|.*', line)
-                if groups and groups[1] != '|':
-                    dbs.append({'schema': groups[1], 'name': groups[2]})
+        if r := self.run_sql('\dt', show_out=False):
+            s = 0
+            for line in r.stdout.split('\n'):
+                line: str = line.strip(' \r')
+                if s == 0:
+                    if 'List of relations' in line:
+                        s = 1
+                elif s == 1:
+                    if 'Schema' in line and 'Name' in line and 'Type' in line:
+                        s = 2
+                elif s == 2:
+                    if line.startswith('---------'):
+                        s = 3
+                elif s == 3:
+                    groups = re.match(r'^\s*(\S*)\s*\|\s*(\S*)\s*\|.*', line)
+                    if groups and groups[1] != '|':
+                        dbs.append({'schema': groups[1], 'name': groups[2]})
 
         return dbs
 
@@ -156,28 +156,35 @@ class PostgresSession:
             return r
         else:
             ns = self.namespace
-            image = Config().get('pg.agent.image', 'seanahnsf/kaqing')
-            pod_name = Config().get('pg.agent.name', 'kaqing-agent')
-            timeout = Config().get('pg.agent.timeout', 3600)
+            pod_name = Config().get('pg.agent.name', 'ops')
+
+            if Config().get('pg.agent.just-in-time', False):
+                image = Config().get('pg.agent.image', 'seanahnsf/kaqing')
+                timeout = Config().get('pg.agent.timeout', 3600)
+                try:
+                    Pods.create(ns, pod_name, image, ['sleep', f'{timeout}'], env={'NAMESPACE': ns}, sa_name='c3')
+                except Exception as e:
+                    if e.status == 409:
+                        if Pods.completed(ns, pod_name):
+                            try:
+                                Pods.delete(pod_name, ns)
+                                Pods.create(ns, pod_name, image, ['sleep', f'{timeout}'], env={'NAMESPACE': ns}, sa_name='c3')
+                            except Exception as e2:
+                                log2("Exception when calling BatchV1Api->create_pod: %s\n" % e2)
+
+                                return
+                    else:
+                        log2("Exception when calling BatchV1Api->create_pod: %s\n" % e)
+
+                        return
+
+                Pods.wait_for_running(ns, pod_name)
 
             try:
-                Pods.create(ns, pod_name, image, ['sleep', f'{timeout}'], env={'NAMESPACE': ns}, sa_name='c3')
-            except Exception as e:
-                if e.status == 409:
-                    if Pods.completed(ns, pod_name):
-                        try:
-                            Pods.delete(pod_name, ns)
-                            Pods.create(ns, pod_name, image, ['sleep', f'{timeout}'], env={'NAMESPACE': ns}, sa_name='c3')
-                        except Exception as e2:
-                            log2("Exception when calling BatchV1Api->create_pod: %s\n" % e2)
-
-                            return
-                else:
-                    log2("Exception when calling BatchV1Api->create_pod: %s\n" % e)
-
-                    return
-
-            Pods.wait_for_running(ns, pod_name)
+                Pods.get(ns, pod_name)
+            except:
+                log2(f"Could not locate {pod_name} pod.")
+                return None
 
             cmd = f'PGPASSWORD="{self.password()}" psql -h {self.endpoint()} -p {self.port()} -U {self.username()} {db} --pset pager=off -c "{sql}"'
 

{kaqing-1.98.86 → kaqing-1.98.88}/adam/commands/user_entry.py

@@ -8,7 +8,7 @@ import threading
 import traceback
 
 from adam import log
-from adam.commands.frontend.code_utils import get_available_port
+from adam.commands.deploy.code_utils import get_available_port
 from adam.config import Config
 from adam.sso.idp import Idp
 from adam.app_session import AppSession, IdpLogin