kaqing 2.0.6__tar.gz → 2.0.7__tar.gz

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

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

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

@@ -50,24 +50,26 @@ 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.yaml', 'r') as file:
+            with open(settings_filename, 'r') as file:
                 settings_data = file.read()
         except:
             try:
-                with open('/kaqing/settings.yaml', 'r') as file:
+                with open(settings_path, 'r') as file:
                     settings_data = file.read()
             except:
                 pass
 
         if not settings_data:
-            log2('settings.yaml not found.')
+            log2(f'{settings_filename} not found.')
             return state
 
         cm_name = Config().get('pod.cm.name', 'ops')
         ConfigMaps.create(cm_name, state.namespace, {
-            'settings.yaml' : settings_data
+            settings_filename : settings_data
         }, labels=labels)
 
         pod_name = Config().get('pod.name', 'ops')
@@ -77,9 +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,
-                           config_map_mount=ConfigMapMount(cm_name, 'settings.yaml', '/kaqing/settings.yaml'))
+        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.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.6 → kaqing-2.0.7}/kaqing.egg-info/PKG-INFO

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

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

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

kaqing-2.0.6/adam/version.py

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