kaqing 1.98.86__py3-none-any.whl → 1.98.88__py3-none-any.whl

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.")
 

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

adam/commands/{frontend → 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
 

adam/commands/{frontend → 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):

adam/commands/{frontend/setup.py → 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=':'))

adam/commands/{frontend/setup_frontend.py → 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'

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'

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

adam/commands/{frontend/teardown.py → 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=':'))

adam/commands/{frontend/teardown_frontend.py → 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'

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'

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}"'
 

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

adam/embedded_params.py

@@ -1,2 +1,2 @@
 def config():
-    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'image': 'seanahnsf/kaqing', 'name': 'kaqing-agent', 'timeout': 86400}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.13', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': {'timings': False, 'exit-on-error': False, 'show-parallelism': False, 'show-out': False}}
+    return {'app': {'console-endpoint': 'https://{host}/{env}/{app}/static/console/index.html', 'cr': {'cluster-regex': '(.*?-.*?)-.*', 'group': 'ops.c3.ai', 'v': 'v2', 'plural': 'c3cassandras'}, 'label': 'c3__app_id-0', 'login': {'admin-group': '{host}/C3.ClusterAdmin', 'ingress': '{app_id}-k8singr-appleader-001', 'timeout': 5, 'session-check-url': 'https://{host}/{env}/{app}/api/8/C3/userSessionToken', 'cache-creds': True, 'cache-username': True, 'url': 'https://{host}/{env}/{app}', 'another': "You're logged in to {has}. However, for this app, you need to log in to {need}.", 'token-server-url': 'http://localhost:{port}', 'password-max-length': 128}, 'strip': '0'}, 'bash': {'workers': 32}, 'cassandra': {'service-name': 'all-pods-service'}, 'cql': {'workers': 32, 'samples': 3, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-superuser', 'password-item': 'password'}}, 'checks': {'compactions-threshold': 250, 'cpu-busy-threshold': 98.0, 'cpu-threshold': 0.0, 'cassandra-data-path': '/c3/cassandra', 'root-disk-threshold': 50, 'cassandra-disk-threshold': 50, 'snapshot-size-cmd': "ls /c3/cassandra/data/data/*/*/snapshots | grep snapshots | sed 's/:$//g' | xargs -I {} du -sk {} | awk '{print $1}' | awk '{s+=$1} END {print s}'", 'snapshot-size-threshold': '40G', 'table-sizes-cmd': "ls -Al /c3/cassandra/data/data/ | awk '{print $9}' | sed 's/\\^r//g' | xargs -I {} du -sk /c3/cassandra/data/data/{}"}, 'get-host-id': {'workers': 32}, 'idps': {'ad': {'email-pattern': '.*@c3.ai', 'uri': 'https://login.microsoftonline.com/53ad779a-93e7-485c-ba20-ac8290d7252b/oauth2/v2.0/authorize?response_type=id_token&response_mode=form_post&client_id=00ff94a8-6b0a-4715-98e0-95490012d818&scope=openid+email+profile&redirect_uri=https%3A%2F%2Fplat.c3ci.cloud%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://login.microsoftonline.com/common/discovery/keys', 'contact': 'Please contact ted.tran@c3.ai.', 'whitelist-file': '/kaqing/members'}, 'okta': {'default': True, 'email-pattern': '.*@c3iot.com', 'uri': 'https://c3energy.okta.com/oauth2/v1/authorize?response_type=id_token&response_mode=form_post&client_id={client_id}&scope=openid+email+profile+groups&redirect_uri=https%3A%2F%2F{host}%2Fc3%2Fc3%2Foidc%2Flogin&nonce={nonce}&state=EMPTY', 'jwks-uri': 'https://c3energy.okta.com/oauth2/v1/keys'}}, 'issues': {'workers': 32}, 'logs': {'path': '/c3/cassandra/logs/system.log'}, 'medusa': {'restore-auto-complete': False}, 'nodetool': {'workers': 32, 'samples': 3, 'commands_in_line': 40}, 'pg': {'name-pattern': '^{namespace}.*-k8spg-.*', 'excludes': '.helm., -admin-secret', 'agent': {'name': 'ops', 'just-in-time': False, 'timeout': 86400, 'image': 'seanahnsf/kaqing'}, 'default-db': 'postgres', 'default-schema': 'postgres', 'secret': {'endpoint-key': 'postgres-db-endpoint', 'port-key': 'postgres-db-port', 'username-key': 'postgres-admin-username', 'password-key': 'postgres-admin-password'}}, 'pod': {'name': 'ops', 'image': 'seanahnsf/kaqing', 'sa': {'name': 'ops', 'proto': 'c3', 'additional-cluster-roles': 'c3aiops-k8ssandra-operator'}, 'label-selector': 'run=ops'}, 'preview': {'rows': 10}, 'processes': {'columns': 'pod,cpu,mem', 'header': 'POD_NAME,CPU,MEM/LIMIT'}, 'reaper': {'service-name': 'reaper-service', 'port-forward': {'timeout': 86400, 'local-port': 9001}, 'abort-runs-batch': 10, 'show-runs-batch': 100, 'pod': {'cluster-regex': '(.*?-.*?-.*?-.*?)-.*', 'label-selector': 'k8ssandra.io/reaper={cluster}-reaper'}, 'secret': {'cluster-regex': '(.*?-.*?)-.*', 'name': '{cluster}-reaper-ui', 'password-item': 'password'}}, 'repair': {'log-path': '/home/cassrepair/logs/', 'image': 'ci-registry.c3iot.io/cloudops/cassrepair:2.0.13', 'secret': 'ciregistryc3iotio', 'env': {'interval': 24, 'timeout': 60, 'pr': False, 'runs': 1}}, 'repl': {'start-drive': 'a', 'auto-enter-app': 'c3/c3', 'auto-enter-only-cluster': True}, 'status': {'columns': 'status,address,load,tokens,owns,host_id,gossip,compactions', 'header': '--,Address,Load,Tokens,Owns,Host ID,GOSSIP,COMPACTIONS'}, 'storage': {'columns': 'pod,volume_root,volume_cassandra,snapshots,data,compactions', 'header': 'POD_NAME,VOLUME /,VOLUME CASS,SNAPSHOTS,DATA,COMPACTIONS'}, 'watch': {'auto': 'rollout', 'timeout': 3600, 'interval': 10}, 'debug': {'timings': False, 'exit-on-error': False, 'show-parallelism': False, 'show-out': False}}

adam/k8s_utils/pods.py

@@ -30,6 +30,13 @@ class Pods:
         except Exception as e:
             log2("Exception when calling CoreV1Api->delete_namespaced_pod: %s\n" % e)
 
+    def delete_with_selector(namespace: str, label_selector: str):
+        v1 = client.CoreV1Api()
+
+        ret = v1.list_namespaced_pod(namespace=namespace, label_selector=label_selector)
+        for i in ret.items:
+            v1.delete_namespaced_pod(name=i.metadata.name, namespace=namespace)
+
     def on_pods(pods: list[str],
                 namespace: str,
                 body: Callable[[ThreadPoolExecutor, str, str, bool], T],
@@ -158,12 +165,12 @@ class Pods:
         v1 = client.CoreV1Api()
         return v1.read_namespaced_pod(name=pod_name, namespace=namespace)
 
-    def create_pod_spec(name: str, image: str, image_pull_secret: str, envs: list, volume_name: str, pvc_name:str, mount_path:str, command: list[str]=None, sa_name=None):
+    def create_pod_spec(name: str, image: str, image_pull_secret: str, envs: list, container_security_context: client.V1SecurityContext, volume_name: str, pvc_name:str, mount_path:str, command: list[str]=None, sa_name=None):
         volume_mounts = []
         if volume_name and pvc_name and mount_path:
             volume_mounts=[client.V1VolumeMount(mount_path=mount_path, name=volume_name)]
 
-        container = client.V1Container(name=name, image=image, env=envs, command=command,
+        container = client.V1Container(name=name, image=image, env=envs, security_context=container_security_context, command=command,
                                     volume_mounts=volume_mounts)
 
         volumes = []
@@ -183,9 +190,12 @@ class Pods:
             volumes=volumes
         )
 
-    def create(namespace: str, pod_name: str, image: str, command: list[str],
+    def create(namespace: str, pod_name: str, image: str,
+               command: list[str] = None,
                secret: str = None,
                env: dict[str, any] = {},
+               container_security_context: client.V1SecurityContext = None,
+               labels: dict[str, str] = {},
                volume_name: str = None,
                pvc_name: str = None,
                mount_path: str = None,
@@ -194,9 +204,14 @@ class Pods:
         envs = []
         for k, v in env.items():
             envs.append(client.V1EnvVar(name=str(k), value=str(v)))
-        pod = Pods.create_pod_spec(pod_name, image, secret, envs, volume_name, pvc_name, mount_path, command=command, sa_name=sa_name)
-        return v1.create_namespaced_pod(namespace=namespace,
-                                        body=client.V1Pod(spec=pod, metadata=client.V1ObjectMeta(name=pod_name)))
+        pod = Pods.create_pod_spec(pod_name, image, secret, envs, container_security_context, volume_name, pvc_name, mount_path, command=command, sa_name=sa_name)
+        return v1.create_namespaced_pod(
+            namespace=namespace,
+            body=client.V1Pod(spec=pod, metadata=client.V1ObjectMeta(
+                name=pod_name,
+                labels=labels
+            ))
+        )
 
     def wait_for_running(namespace: str, pod_name: str):
         msged = False

adam/k8s_utils/service_accounts.py

@@ -0,0 +1,169 @@
+from kubernetes import client, config
+
+from adam.config import Config
+
+# utility collection on service accounts; methods are all static
+class ServiceAccounts:
+    def delete(namespace: str, label_selector: str):
+        ServiceAccounts.delete_cluster_role_bindings(label_selector)
+        ServiceAccounts.delete_role_bindings(namespace, label_selector)
+        ServiceAccounts.delete_service_account(namespace, label_selector)
+
+    def replicate(to_sa: str, namespace: str, from_sa: str, labels: dict[str, str] = {}, add_cluster_roles: list[str] = []):
+        ServiceAccounts.create_service_account(to_sa, namespace, labels=labels)
+        for b in ServiceAccounts.get_role_bindings(from_sa, namespace):
+            n = f'{to_sa}-{b.role_ref.name}'
+            ServiceAccounts.create_role_binding(n, namespace, to_sa, b.role_ref.name, labels=labels)
+
+        for b in ServiceAccounts.get_cluster_role_bindings(from_sa):
+            n = f'{to_sa}-{b.role_ref.name}'
+            ServiceAccounts.create_cluster_role_binding(n, namespace, to_sa, b.role_ref.name, labels=labels)
+
+        for cr in add_cluster_roles:
+            n = f'{to_sa}-{cr}'
+            ServiceAccounts.create_cluster_role_binding(n, namespace, to_sa, cr, labels=labels)
+
+    def create_service_account(name: str, namespace: str, labels: dict[str, str] = {}):
+        config.load_kube_config()
+
+        v1 = client.CoreV1Api()
+
+        service_account = client.V1ServiceAccount(
+            metadata=client.V1ObjectMeta(
+                name=name,
+                labels=labels)
+        )
+        api_response = v1.create_namespaced_service_account(
+            namespace=namespace,
+            body=service_account
+        )
+        Config().debug(f"Service Account '{api_response.metadata.name}' created in namespace '{namespace}'.")
+
+    def delete_service_account(namespace: str, label_selector: str) -> list:
+        refs = []
+
+        v1 = client.CoreV1Api()
+        sas = v1.list_namespaced_service_account(namespace=namespace, label_selector=label_selector).items
+        for sa in sas:
+            Config().debug(f'delete {sa.metadata.name}')
+            v1.delete_namespaced_service_account(name=sa.metadata.name, namespace=namespace)
+            refs.append(sa)
+
+        return refs
+
+    def create_role_binding(name: str, namespace: str, sa_name: str, role_name: str, labels: dict[str, str] = {}):
+        api = client.RbacAuthorizationV1Api()
+
+        metadata = client.V1ObjectMeta(
+            name=name,
+            namespace=namespace,
+            labels=labels
+        )
+        role_ref = client.V1RoleRef(
+            api_group="rbac.authorization.k8s.io",
+            kind="Role",
+            name=role_name
+        )
+
+        subjects = [
+            client.RbacV1Subject(
+                kind="ServiceAccount",
+                name=sa_name, # Name of the service account
+                namespace=namespace # Namespace of the service account
+            )
+        ]
+
+        role_binding = client.V1RoleBinding(
+            api_version="rbac.authorization.k8s.io/v1",
+            kind="RoleBinding",
+            metadata=metadata,
+            role_ref=role_ref,
+            subjects=subjects
+        )
+
+        api.create_namespaced_role_binding(namespace=namespace, body=role_binding)
+
+    def get_role_bindings(service_account_name: str, namespace: str) -> list:
+        refs = []
+
+        rbac_api = client.RbacAuthorizationV1Api()
+        role_bindings = rbac_api.list_namespaced_role_binding(namespace=namespace)
+        for binding in role_bindings.items:
+            if binding.subjects:
+                for subject in binding.subjects:
+                    if subject.kind == "ServiceAccount" and subject.name == service_account_name:
+                        refs.append(binding)
+
+        return refs
+
+    def delete_role_bindings(namespace: str, label_selector: str) -> list:
+        refs = []
+
+        v1_rbac = client.RbacAuthorizationV1Api()
+        cluster_role_bindings = v1_rbac.list_namespaced_role_binding(namespace=namespace, label_selector=label_selector).items
+        for binding in cluster_role_bindings:
+            Config().debug(f'delete {binding.metadata.name}')
+            v1_rbac.delete_namespaced_role_binding(name=binding.metadata.name, namespace=namespace)
+            refs.append(binding)
+
+        return refs
+
+    def create_cluster_role_binding(name: str, namespace: str, sa_name: str, role_name: str, labels: dict[str, str] = {}):
+        api = client.RbacAuthorizationV1Api()
+
+        metadata = client.V1ObjectMeta(
+            name=name,
+            namespace=namespace,
+            labels=labels
+        )
+        role_ref = client.V1RoleRef(
+            api_group="rbac.authorization.k8s.io",
+            kind="ClusterRole",
+            name=role_name
+        )
+
+        subjects = [
+            client.RbacV1Subject(
+                kind="ServiceAccount",
+                name=sa_name,
+                namespace=namespace
+            )
+        ]
+
+        role_binding = client.V1ClusterRoleBinding(
+            api_version="rbac.authorization.k8s.io/v1",
+            metadata=metadata,
+            role_ref=role_ref,
+            subjects=subjects
+        )
+
+        try:
+            api.create_cluster_role_binding(body=role_binding)
+        except client.ApiException as e:
+            print(f"Error creating ClusterRoleBinding: {e}")
+
+    def get_cluster_role_bindings(service_account_name: str) -> list:
+        refs = []
+
+        v1_rbac = client.RbacAuthorizationV1Api()
+        cluster_role_bindings = v1_rbac.list_cluster_role_binding().items
+        for binding in cluster_role_bindings:
+            if binding.subjects:
+                for subject in binding.subjects:
+                    if subject.kind == "ServiceAccount" and subject.name == service_account_name:
+                        refs.append(binding)
+
+        return refs
+
+
+    def delete_cluster_role_bindings(label_selector: str) -> list:
+        refs = []
+
+        v1_rbac = client.RbacAuthorizationV1Api()
+        cluster_role_bindings = v1_rbac.list_cluster_role_binding(label_selector=label_selector).items
+        for binding in cluster_role_bindings:
+            Config().debug(f'delete {binding.metadata.name}')
+            v1_rbac.delete_cluster_role_binding(binding.metadata.name)
+            refs.append(binding)
+
+        return refs

adam/repl_commands.py

@@ -1,11 +1,13 @@
 from adam.commands.app import App
 from adam.commands.app_ping import AppPing
-from adam.commands.frontend.code_start import CodeStart
-from adam.commands.frontend.code_stop import CodeStop
-from adam.commands.frontend.setup import Setup
-from adam.commands.frontend.setup_frontend import SetupFrontend
-from adam.commands.frontend.teardown import TearDown
-from adam.commands.frontend.teardown_frontend import TearDownFrontend
+from adam.commands.deploy.code_start import CodeStart
+from adam.commands.deploy.code_stop import CodeStop
+from adam.commands.deploy.deploy import Deploy
+from adam.commands.deploy.deploy_frontend import DeployFrontend
+from adam.commands.deploy.deploy_pod import DeployPod
+from adam.commands.deploy.undeploy import Undeploy
+from adam.commands.deploy.undeploy_frontend import UndeployFrontend
+from adam.commands.deploy.undeploy_pod import UndeployPod
 from adam.commands.show.show_app_queues import ShowAppQueues
 from adam.commands.cp import ClipboardCopy
 from adam.commands.bash import Bash
@@ -48,7 +50,7 @@ class ReplCommands:
         cmds: list[Command] = ReplCommands.navigation() + ReplCommands.cassandra_check() + ReplCommands.cassandra_ops() + \
             ReplCommands.tools() + ReplCommands.app() + ReplCommands.exit()
 
-        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Setup(), Show(), TearDown()]
+        intermediate_cmds: list[Command] = [App(), Reaper(), Repair(), Deploy(), Show(), Undeploy()]
         ic = [c.command() for c in intermediate_cmds]
         # 1. dedup commands
         deduped = []
@@ -75,7 +77,7 @@ class ReplCommands:
         return Medusa.cmd_list() + [Restart(), RollOut(), Watch()] + Reaper.cmd_list() + Repair.cmd_list()
 
     def tools() -> list[Command]:
-        return [Cqlsh(), Postgres(), Bash(), CodeStart(), CodeStop(), SetupFrontend(), TearDownFrontend()]
+        return [Cqlsh(), Postgres(), Bash(), CodeStart(), CodeStop(), DeployFrontend(), UndeployFrontend(), DeployPod(), UndeployPod()]
 
     def app() -> list[Command]:
         return [ShowAppActions(), ShowAppId(), ShowAppQueues(), AppPing(), App()]

adam/sso/authenticator.py

@@ -9,7 +9,7 @@ class Authenticator:
         return None
 
     @abstractmethod
-    def authenticate(self, idp_uri: str, app_host: str, username: str, password: str) -> IdpLogin:
+    def authenticate(self, idp_uri: str, app_host: str, username: str, password: str, verify: bool = True) -> IdpLogin:
         pass
 
     def extract(self, form: str, pattern: re.Pattern):

adam/sso/authn_ad.py

@@ -24,7 +24,7 @@ class AdAuthenticator(Authenticator):
 
         return cls.instance
 
-    def authenticate(self, idp_uri: str, app_host: str, username: str, password: str) -> IdpLogin:
+    def authenticate(self, idp_uri: str, app_host: str, username: str, password: str, verify: bool) -> IdpLogin:
         parsed_url = urlparse(idp_uri)
         query_string = parsed_url.query
         params = parse_qs(query_string)
@@ -84,6 +84,9 @@ class AdAuthenticator(Authenticator):
         if not id_token:
             raise AdException('Invalid username/password.')
 
+        if not verify:
+            return IdpLogin(redirect_url, id_token, state_token, username, idp_uri=idp_uri, id_token_obj=None, session=session)
+
         parsed = self.parse_id_token(id_token)
         roles = parsed.groups
         roles.append(username)

adam/sso/authn_okta.py

@@ -23,7 +23,7 @@ class OktaAuthenticator(Authenticator):
 
         return cls.instance
 
-    def authenticate(self, idp_uri: str, app_host: str, username: str, password: str) -> IdpLogin:
+    def authenticate(self, idp_uri: str, app_host: str, username: str, password: str, verify: bool) -> IdpLogin:
         parsed_url = urlparse(idp_uri)
         query_string = parsed_url.query
         params = parse_qs(query_string)
@@ -71,6 +71,10 @@ class OktaAuthenticator(Authenticator):
 
             raise OktaException('Invalid username/password.')
 
+        if not verify:
+            # just relay id_token, it will be verified by SP
+            return IdpLogin(redirect_url, id_token, state_token, username, idp_uri=idp_uri, id_token_obj=None, session=session)
+
         if group := Config().get('app.login.admin-group', '{host}/C3.ClusterAdmin').replace('{host}', app_host):
             parsed = OktaAuthenticator.parse_id_token(okta_host, id_token)
             if group not in parsed.groups:

adam/sso/idp.py

@@ -28,7 +28,7 @@ class Idp:
 
         return cls.instance
 
-    def login(app_host: str, username: str = None, idp_uri: str = None, forced = False, use_token_from_env = True, use_cached_creds = True) -> IdpLogin:
+    def login(app_host: str, username: str = None, idp_uri: str = None, forced = False, use_token_from_env = True, use_cached_creds = True, verify = True) -> IdpLogin:
         session: IdpSession = IdpSession.create(username, app_host, app_host, idp_uri=idp_uri)
 
         if use_token_from_env:
@@ -95,13 +95,13 @@ class Idp:
 
             if username and password:
                 # if uploading kubeconfig file fails many times, you will be locked out
-                # kubeconfig file content has first char as tab and length of bigger than 128
+                # kubeconfig file content has first char as tab or length of bigger than 128
                 if password[0] == '\t' or len(password) > Config().get('app.login.password-max-length', 128):
                     if r := Idp.try_kubeconfig(username, password):
                         log(f"You're signed in as {username}")
                         return r
                 else:
-                    if r := session.authenticator.authenticate(session.idp_uri, app_host, username, password):
+                    if r := session.authenticator.authenticate(session.idp_uri, app_host, username, password, verify=verify):
                         log(f"You're signed in as {username}")
                     return r
         finally:

adam/version.py

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

{kaqing-1.98.86.dist-info → kaqing-1.98.88.dist-info}/METADATA

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

@@ -1,20 +1,20 @@
 adam/__init__.py,sha256=oVw1FNd9HZPJ7wm6BNn5ybyNGJLjJ8kopMeBiwgMaOI,59
-adam/app_session.py,sha256=K_Hk6M63EKEdEXGBivqzZRrCGq3ZkhjRM03Hjw0cDTc,6955
+adam/app_session.py,sha256=Klypm4JYHOlovaRCHAZ2P_Mj_nheMlcQgX403R0TJGk,6969
 adam/apps.py,sha256=UTpUJBAMRFvR8kJZwileGC0UmPvsOjJ_AgvWoGmnIFI,6701
-adam/batch.py,sha256=P_bQUPaS-38cVwdPnLwOwlirQuyHQiPNhYteV-y7B68,24108
+adam/batch.py,sha256=vJRniGz0L8CXluVqP_EMFnthuZdILBMNUmNzxz9ImeI,24110
 adam/cli.py,sha256=03pIZdomAu7IL-GSP6Eun_PKwwISShRAmfx6eVRPGC0,458
 adam/cli_group.py,sha256=W3zy1BghCtVcEXizq8fBH-93ZRVVwgAyGPzy0sHno1Y,593
 adam/config.py,sha256=38UcmYRxf-Kq4iPbKS7tNPQqN64fam1bWNy6jhWREd0,2552
 adam/embedded_apps.py,sha256=lKPx63mKzJbNmwz0rgL4gF76M9fDGxraYTtNAIGnZ_s,419
-adam/embedded_params.py,sha256=dDK6TfDRdUqbLkj6UaQK7U9_ER7-3BmwAHqpPKbnQ5w,4170
+adam/embedded_params.py,sha256=sHOxnZLjaDX7oN5VKeCzCpbEMb-1x6Nn9lRA7PE7mos,4362
 adam/log.py,sha256=gg5DK52wLPc9cjykeh0WFHyAk1qI3HEpGaAK8W2dzXY,1146
 adam/pod_exec_result.py,sha256=nq0xnCNOpUGBSijGF0H-YNrwBc9vUQs4DkvLMIFS5LQ,951
 adam/repl.py,sha256=wEzkXaFaT1PWWYI3AZ32j01efN7HpL2xvMfGLEmYIL4,7036
-adam/repl_commands.py,sha256=8OtR14WbCpFNS4CYH8g9xgarXvVr3fZa9XzAVmtBphI,3912
+adam/repl_commands.py,sha256=iHR9LqUzBveRVuuPhLdF8M9CayboFCzYNmz6xP0byME,4046
 adam/repl_session.py,sha256=uIogcvWBh7wd8QQ-p_JgLsyJ8YJgINw5vOd6JIsd7Vo,472
 adam/repl_state.py,sha256=QarrUAwYWOz3YTemtaf2opbHLa5a3LEsyuonNwhvOhk,7131
 adam/utils.py,sha256=j7p7iruLuV11swa0z9ZLBgoJHu_nkTSVKtQe0q71gmk,7025
-adam/version.py,sha256=yNGjBFrTZ06XpSJo_H-75KNiUMrf7yk1-aRokauiv0I,140
+adam/version.py,sha256=b_uKoBDt32TpOid0_wR1sYA_Ut__Wbgm53S3X58HGdE,140
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -75,16 +75,19 @@ adam/commands/pwd.py,sha256=VlgFjxFl66I7Df1YI6cuiEeY6Q13lEavMKfrzHLESKo,2340
 adam/commands/report.py,sha256=Ky45LIzSlB_X4V12JZWjU3SA2u4_FKRencRTq7psOWU,1944
 adam/commands/restart.py,sha256=Hik1t5rjH2ATZv4tzwrGB3e44b3dNuATgY327_Nb8Bs,2044
 adam/commands/rollout.py,sha256=52_4ijna3v-8Oug12et43DRHFDNhiN34p6xLTQmhdbQ,2959
-adam/commands/user_entry.py,sha256=4TaFM6pp2ZDmwE4f5yMizD9wve0CHOlKPS6x6RBg7cI,4742
+adam/commands/user_entry.py,sha256=7PeRYPpGU4x3kyQnUBxVaOH47anx7YwVPSIz-0Rfpko,4740
 adam/commands/watch.py,sha256=mmBFpB8T1V7zrNs5b2YNyDDztMym_ILPDdkrbdAXTas,2438
-adam/commands/frontend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/commands/frontend/code_start.py,sha256=nkk2tTmEFobtJ6TD9nRplXaGYovYBq-05PKxA8benvI,1372
-adam/commands/frontend/code_stop.py,sha256=stpADpZ1gvQsLEriCPRp0sE9h5CFxskbPWnrMs3me5U,1698
-adam/commands/frontend/code_utils.py,sha256=5Gp4U8HzKpPkbkHDU7whlvGOK-wWaAbCIIGzVoN9hio,3296
-adam/commands/frontend/setup.py,sha256=teboue6gvy72ABOz-8oQUXQIOKFm7RrKMuM7u6OETww,1776
-adam/commands/frontend/setup_frontend.py,sha256=4mgyA_K6ldYy_zzQ5ZpDUphvKxtkdyFToQzB0j9ci2k,2010
-adam/commands/frontend/teardown.py,sha256=VtFLU6Tt-lXiOK3mT8TQP3dcfpf3IMqncb7mSY5hXNE,1876
-adam/commands/frontend/teardown_frontend.py,sha256=u7QEqpaBu7-ZJjaQ1UwnnOMKB0Oz_m8OToNrYasFsEs,1257
+adam/commands/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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=ymGprq2rBpAMsxaqRrVnrcYetAq9GDTguohlAWFuFa8,1855
+adam/commands/deploy/deploy_frontend.py,sha256=kc4GnpRMa3a384tLN8d9FN1XUcRrbwkpVUY1O3YkJU0,1774
+adam/commands/deploy/deploy_pod.py,sha256=cJCt4DlNrr_JuDb_X3h_8b2Zsh8k7uzu2F5FeFmAirQ,2522
+adam/commands/deploy/deploy_utils.py,sha256=7KZAG7oz9U0EtV2Q6kw8q4x89RmeaTxQjnLfH5KZC5Q,1166
+adam/commands/deploy/undeploy.py,sha256=JWRwYLiS7iD2utRr2Zb8HCg_rbgHTw-A17CCs2ezl00,1949
+adam/commands/deploy/undeploy_frontend.py,sha256=P04l_DI6y1dAqHMQMG94MG7K4piCw84zhPszc4Lz28o,1349
+adam/commands/deploy/undeploy_pod.py,sha256=xiqenETzyzvQK0fH6OPtfNpww9E8ArHHFMWp9rTC6aU,1842
 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
@@ -95,7 +98,7 @@ adam/commands/postgres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 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_session.py,sha256=cpx5vlH6V9XgRPKC_YzDXh2OeeuSa_z4dJU5TV6OxNo,8512
+adam/commands/postgres/postgres_session.py,sha256=u9KWgIWt1PknlpPMPtk6s8dwi0rgrHAuozvuDFUtoyE,8933
 adam/commands/reaper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/commands/reaper/reaper.py,sha256=SbxXgJ6b4wdXx5a1Fps71iEa1hmycWbArh1oC5bS83M,2677
 adam/commands/reaper/reaper_forward.py,sha256=mUp409MzT91cVXGxoPfBGceaR3qZ0rVdWKGdyzPNzSA,3177
@@ -137,23 +140,24 @@ adam/k8s_utils/custom_resources.py,sha256=cIeaZRQET2DelTGU2f5QsMckh7TddPpWZDFeNK
 adam/k8s_utils/ingresses.py,sha256=ul3Z6fDGc_Cxcn-ExP0vXhZatoShCUZFtpwtCY4Qx7o,3460
 adam/k8s_utils/jobs.py,sha256=P7j3JiZ33TRnkjkPLLrGlypAPxK1BZQHvVpF8s7eHA8,2604
 adam/k8s_utils/kube_context.py,sha256=nocEyVNjXWG-N-GNnEYHDvnot7H5LQUFmpZIwIyE7As,3310
-adam/k8s_utils/pods.py,sha256=G0ePuYTYTeNIwNaSemPuinJR7fKy5GG6faWhv6KBlFQ,7986
+adam/k8s_utils/pods.py,sha256=OnQo59k01lyZ_ZKBW2--8itZ5xgKoU17p5SFSm1le6o,8608
 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
 adam/k8s_utils/statefulsets.py,sha256=PZDEhy34aXxLkbW1-RsOC0E4D0w0pHyoIQGHvcAzSAk,4606
 adam/k8s_utils/volumes.py,sha256=MzYeH80NqKlhdadx6d0tW-j8vTOCUYWx7wRURIZWKZ8,843
 adam/sso/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adam/sso/authenticator.py,sha256=WD89YfWWt0qCqqm2q1LQ5UxbJnTJIm15WT1xXx4ArX8,594
-adam/sso/authn_ad.py,sha256=lnpH4jOyAw22leYzbuu7GstNLUOvf77FJOKuzgwB6HU,5746
-adam/sso/authn_okta.py,sha256=MWSwI3k88QoDOneDFhu221OrAi4LxfVEaBSBxWLZzAg,4302
+adam/sso/authenticator.py,sha256=BCm16L9zf5aLU47-sTCnudn2zLPwd8M2wwRminJfsqw,615
+adam/sso/authn_ad.py,sha256=BfKoltUG3jP0vNe-MImhnjkufBo79aH1HGZcQtHFH_Q,5912
+adam/sso/authn_okta.py,sha256=TV5vg7OEQPGFG_DSUQnWn37nbMX_qszZB0GRuQl6kGM,4529
 adam/sso/cred_cache.py,sha256=7WA5rIy1wlr_GCF-Z6xRb6LzRu-Cvou-IkY7hWC3Zpc,2099
 adam/sso/id_token.py,sha256=wmVZ8S0sjScnOxmSvOKlIEKgnvdWqhsgq9XjFe355O4,744
-adam/sso/idp.py,sha256=P8XXIjpFzeKsbbO24NMvEzQBGHkj15go7qRpSwhS9_4,5775
+adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=t49CRlMyHA76BAj_kKq0Wa9URIYlzBsUCSmn7Jf5o6I,1721
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-1.98.86.dist-info/METADATA,sha256=fS_WXJOl25NBGD6vZ1fn5EWygTzYLMQdpjdCL7Iz-lA,133
-kaqing-1.98.86.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-1.98.86.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-1.98.86.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-1.98.86.dist-info/RECORD,,
+kaqing-1.98.88.dist-info/METADATA,sha256=LquFVHPcx1N3O_uIWngJKW2sLmWKBfE0vhEI1X5nwZA,133
+kaqing-1.98.88.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-1.98.88.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-1.98.88.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-1.98.88.dist-info/RECORD,,