kaqing 2.0.6__py3-none-any.whl → 2.0.7__py3-none-any.whl

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)
 

adam/version.py

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

{kaqing-2.0.6.dist-info → kaqing-2.0.7.dist-info}/METADATA

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

@@ -14,7 +14,7 @@ adam/repl_commands.py,sha256=ionPWjPhzrzm59zbhO1WsGGcLVba3bnPl6uPjvQ4C34,4093
 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=3UZfi5Flr04vagqtID10Qjwa--bkUKyTfmVPlMdbhB4,138
+adam/version.py,sha256=HFL4yDyv3I_bTylSWpnX7w-UTLtopafIA3UszxHCKbM,138
 adam/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 adam/checks/check.py,sha256=Qopr3huYcMu2bzQgb99dEUYjFzkjKHRI76S6KA9b9Rk,702
 adam/checks/check_context.py,sha256=FEHkQ32jY1EDopQ2uYWqy9v7aEEX1orLpJWhopwAlh4,402
@@ -83,7 +83,7 @@ adam/commands/deploy/code_stop.py,sha256=ch7ZMgosvTHsGaIcDwQY5XYh_5HYrUjBkZFOI-d
 adam/commands/deploy/code_utils.py,sha256=5Gp4U8HzKpPkbkHDU7whlvGOK-wWaAbCIIGzVoN9hio,3296
 adam/commands/deploy/deploy.py,sha256=_y_pSBHIEVMTgjDqEZwvmGfLQBirHBH4sCnsl0CKOM8,1792
 adam/commands/deploy/deploy_frontend.py,sha256=TSvMTy6uUfOBIV96hKFy-M1hNCE6OeRW9M_dj1ZJsv0,1700
-adam/commands/deploy/deploy_pod.py,sha256=vtd0SUfrT7AFLftjbX7zn3_wTwJehUw7uVd8zEf8OHQ,3494
+adam/commands/deploy/deploy_pod.py,sha256=q6Cugc9SzRgztbX4kBkFxbmwXiDzXxYfrxput7H4zeA,3640
 adam/commands/deploy/deploy_utils.py,sha256=-YB-XUwr8zVsf9HKYWx_TP-dB2WgOpEmUGyYNcoie0U,1046
 adam/commands/deploy/undeploy.py,sha256=CNgbB00TR1YRgX0xGgdGAT8YNPlcLssMsRX-pSby-Ao,1842
 adam/commands/deploy/undeploy_frontend.py,sha256=mbHlWb5UHUVpR1trfflCS_TDip7eAqxqoZ47RzRZcno,1257
@@ -158,8 +158,8 @@ adam/sso/idp.py,sha256=fvcwUw_URTgsO6ySaqTIw0zQT2qRO1IPSGhf6rPtybo,5804
 adam/sso/idp_login.py,sha256=QAtCUeDTVWliJy40RK_oac8Vgybr13xH8wzeBoxPaa8,1754
 adam/sso/idp_session.py,sha256=9BUHNRf70u4rVKrVY1HKPOEmOviXvkjam8WJxmXSKIM,1735
 adam/sso/sso_config.py,sha256=5N8WZgIJQBtHUy585XLRWKjpU87_v6QluyNK9E27D5s,2459
-kaqing-2.0.6.dist-info/METADATA,sha256=8ALpixpMJyqS5oZzJX0QnxEnmHe1BBfEgsjaIOH4C8c,131
-kaqing-2.0.6.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-kaqing-2.0.6.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
-kaqing-2.0.6.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
-kaqing-2.0.6.dist-info/RECORD,,
+kaqing-2.0.7.dist-info/METADATA,sha256=_nL7f5ipkYIu_Ng4c2g2Jiw7uKaMThfR65PWgO6uba4,131
+kaqing-2.0.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+kaqing-2.0.7.dist-info/entry_points.txt,sha256=SkzhuQJUWsXOzHeZ5TgQ2c3_g53UGK23zzJU_JTZOZI,39
+kaqing-2.0.7.dist-info/top_level.txt,sha256=8_2PZkwBb-xDcnc8a2rAbQeJhXKXskc7zTP7pSPa1fw,5
+kaqing-2.0.7.dist-info/RECORD,,