kaqing 2.0.5__tar.gz → 2.0.7__tar.gz

{kaqing-2.0.5 → kaqing-2.0.7}/PKG-INFO

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

{kaqing-2.0.5 → kaqing-2.0.7}/adam/commands/deploy/deploy_pod.py

@@ -1,12 +1,15 @@
 from kubernetes import client
+import yaml
 
 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.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
 
@@ -47,6 +50,28 @@ class DeployPod(Command):
         labels = gen_labels(label_selector)
         ServiceAccounts.replicate(sa_name, state.namespace, sa_proto, labels=labels, add_cluster_roles=additional_cluster_roles)
 
+        settings_filename = 'settings.yaml'
+        settings_path = f'/kaqing/{settings_filename}'
+        settings_data = None
+        try:
+            with open(settings_filename, 'r') as file:
+                settings_data = file.read()
+        except:
+            try:
+                with open(settings_path, 'r') as file:
+                    settings_data = file.read()
+            except:
+                pass
+
+        if not settings_data:
+            log2(f'{settings_filename} not found.')
+            return state
+
+        cm_name = Config().get('pod.cm.name', 'ops')
+        ConfigMaps.create(cm_name, state.namespace, {
+            settings_filename : settings_data
+        }, labels=labels)
+
         pod_name = Config().get('pod.name', 'ops')
         image = Config().get('pod.image', 'seanahnsf/kaqing')
         security_context = client.V1SecurityContext(
@@ -54,7 +79,11 @@ class DeployPod(Command):
                 add=["SYS_PTRACE"]
             )
         )
-        Deployments.create(state.namespace, pod_name, image, env={'NAMESPACE': state.namespace}, container_security_context=security_context, labels=labels, sa_name=sa_name)
+        Deployments.create(state.namespace, pod_name, image,
+                           env={'NAMESPACE': state.namespace},
+                           container_security_context=security_context,
+                           labels=labels, sa_name=sa_name,
+                           config_map_mount=ConfigMapMount(cm_name, settings_filename, settings_path))
 
         uri = deploy_frontend(pod_name, state.namespace, label_selector)
 

{kaqing-2.0.5 → kaqing-2.0.7}/adam/commands/deploy/undeploy_pod.py

@@ -1,6 +1,7 @@
 from adam.commands.command import Command
 from adam.commands.deploy.deploy_utils import undeploy_frontend
 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
@@ -39,6 +40,10 @@ class UndeployPod(Command):
             ServiceAccounts.delete(state.namespace, label_selector=label_selector)
         except Exception as e:
             log2(e)
+        try:
+            ConfigMaps.delete_with_selector(state.namespace, label_selector)
+        except Exception as e:
+            log2(e)
         try:
             Deployments.delete_with_selector(state.namespace, label_selector, grace_period_seconds=0)
         except Exception as e:

kaqing-2.0.7/adam/k8s_utils/config_maps.py

@@ -0,0 +1,34 @@
+from kubernetes import client
+
+# utility collection on config maps; methods are all static
+class ConfigMaps:
+    def create(name: str, namespace: str, data: dict[str, str], labels: dict[str, str] = {}):
+        v1 = client.CoreV1Api()
+
+        metadata = client.V1ObjectMeta(
+            name=name,
+            namespace=namespace,
+            labels=labels
+        )
+
+        configmap = client.V1ConfigMap(
+            api_version="v1",
+            kind="ConfigMap",
+            metadata=metadata,
+            data=data
+        )
+
+        try:
+            api_response = v1.create_namespaced_config_map(body=configmap, namespace=namespace)
+            # print(f"ConfigMap '{name}' created successfully in namespace '{namespace}'.")
+            # print(api_response)
+        except client.ApiException as e:
+            # print(f"Error creating ConfigMap: {e}")
+            raise e
+
+    def delete_with_selector(namespace: str, label_selector: str):
+        v1 = client.CoreV1Api()
+
+        ret = v1.list_namespaced_config_map(namespace=namespace, label_selector=label_selector)
+        for i in ret.items:
+            v1.delete_namespaced_config_map(name=i.metadata.name, namespace=namespace)

{kaqing-2.0.5 → kaqing-2.0.7}/adam/k8s_utils/deployment.py

@@ -1,6 +1,7 @@
 from kubernetes import client
 
 from adam.k8s_utils.pods import Pods
+from adam.k8s_utils.volumes import ConfigMapMount
 
 # utility collection on deployments; methods are all static
 class Deployments:
@@ -14,7 +15,8 @@ class Deployments:
     def create_deployment_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, labels: dict[str, str] = {}):
+                               command: list[str]=None, sa_name=None, labels: dict[str, str] = {},
+                               config_map_mount: ConfigMapMount = None):
         return client.V1DeploymentSpec(
             replicas=1,
             selector=client.V1LabelSelector(match_labels=labels),
@@ -22,7 +24,7 @@ class Deployments:
                 metadata=client.V1ObjectMeta(labels=labels),
                 spec=Pods.create_pod_spec(name, image, image_pull_secret, envs, container_security_context,
                                           volume_name, pvc_name, mount_path, command=command, sa_name=sa_name,
-                                          restart_policy="Always"),
+                                          restart_policy="Always", config_map_mount=config_map_mount),
             ),
         )
 
@@ -35,12 +37,16 @@ class Deployments:
                volume_name: str = None,
                pvc_name: str = None,
                mount_path: str = None,
-               sa_name=None):
+               sa_name=None,
+               config_map_mount: ConfigMapMount = None):
         v1 = client.AppsV1Api()
         envs = []
         for k, v in env.items():
             envs.append(client.V1EnvVar(name=str(k), value=str(v)))
-        deployment = Deployments.create_deployment_spec(deployment_name, image, secret, envs, container_security_context, volume_name, pvc_name, mount_path, command=command, sa_name=sa_name, labels=labels)
+        deployment = Deployments.create_deployment_spec(deployment_name, image, secret, envs,
+                                                        container_security_context, volume_name, pvc_name,
+                                                        mount_path, command=command, sa_name=sa_name, labels=labels,
+                                                        config_map_mount=config_map_mount)
         return v1.create_namespaced_deployment(
             namespace=namespace,
             body=client.V1Deployment(spec=deployment, metadata=client.V1ObjectMeta(

{kaqing-2.0.5 → kaqing-2.0.7}/adam/k8s_utils/pods.py

@@ -8,6 +8,7 @@ from kubernetes.stream import stream
 from kubernetes.stream.ws_client import ERROR_CHANNEL
 
 from adam.config import Config
+from adam.k8s_utils.volumes import ConfigMapMount
 from adam.pod_exec_result import PodExecResult
 from adam.utils import elapsed_time, log2
 from .kube_context import KubeContext
@@ -175,11 +176,15 @@ class Pods:
     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, restart_policy="Never"):
+                        command: list[str]=None, sa_name : str = None, config_map_mount: ConfigMapMount = None,
+                        restart_policy="Never"):
         volume_mounts = []
         if volume_name and pvc_name and mount_path:
             volume_mounts=[client.V1VolumeMount(mount_path=mount_path, name=volume_name)]
 
+        if config_map_mount:
+            volume_mounts.append(client.V1VolumeMount(mount_path=config_map_mount.mount_path, sub_path=config_map_mount.sub_path, name=config_map_mount.name()))
+
         container = client.V1Container(name=name, image=image, env=envs, security_context=container_security_context, command=command,
                                     volume_mounts=volume_mounts)
 
@@ -191,6 +196,9 @@ class Pods:
         if not sa_name:
             security_context=client.V1PodSecurityContext(run_as_user=1001, run_as_group=1001, fs_group=1001)
 
+        if config_map_mount:
+            volumes.append(client.V1Volume(name=config_map_mount.name(), config_map=client.V1ConfigMapVolumeSource(name=config_map_mount.config_map_name)))
+
         return client.V1PodSpec(
             restart_policy=restart_policy,
             containers=[container],
@@ -209,12 +217,14 @@ class Pods:
                volume_name: str = None,
                pvc_name: str = None,
                mount_path: str = None,
-               sa_name=None):
+               sa_name: str = None,
+               config_map_mount: ConfigMapMount = None):
         v1 = client.CoreV1Api()
         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, container_security_context, volume_name, pvc_name, mount_path, command=command, sa_name=sa_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, config_map_mount=config_map_mount)
         return v1.create_namespaced_pod(
             namespace=namespace,
             body=client.V1Pod(spec=pod, metadata=client.V1ObjectMeta(

{kaqing-2.0.5 → kaqing-2.0.7}/adam/k8s_utils/volumes.py

@@ -1,6 +1,15 @@
 from kubernetes import client
 from adam.utils import log2
 
+class ConfigMapMount:
+    def __init__(self, config_map_name: str, sub_path: str, mount_path: str):
+        self.config_map_name = config_map_name
+        self.sub_path = sub_path
+        self.mount_path = mount_path
+
+    def name(self) -> str:
+        return f"{self.config_map_name}-volume"
+
 # utility collection on volumes; methods are all static
 class Volumes:
     def create_pvc(name: str, storage: int, namespace: str):

kaqing-2.0.7/adam/version.py

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

{kaqing-2.0.5 → kaqing-2.0.7}/kaqing.egg-info/PKG-INFO

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

{kaqing-2.0.5 → kaqing-2.0.7}/kaqing.egg-info/SOURCES.txt

@@ -138,6 +138,7 @@ adam/commands/show/show_storage.py
 adam/k8s_utils/__init__.py
 adam/k8s_utils/cassandra_clusters.py
 adam/k8s_utils/cassandra_nodes.py
+adam/k8s_utils/config_maps.py
 adam/k8s_utils/custom_resources.py
 adam/k8s_utils/deployment.py
 adam/k8s_utils/ingresses.py

{kaqing-2.0.5 → kaqing-2.0.7}/setup.py

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

kaqing-2.0.5/adam/version.py

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