kaqing 1.98.89__tar.gz → 1.98.90__tar.gz

{kaqing-1.98.89 → kaqing-1.98.90}/PKG-INFO

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

{kaqing-1.98.89 → kaqing-1.98.90}/adam/commands/deploy/deploy_frontend.py

@@ -38,7 +38,8 @@ class DeployFrontend(Command):
         pod_name = Config().get('pod.name', 'ops')
         label_selector = Config().get('pod.label-selector', 'run=ops')
         try:
-            deploy_frontend(pod_name, state.namespace, label_selector)
+            uri = deploy_frontend(pod_name, state.namespace, label_selector)
+            log2(f'Ops pod is available at {uri}.')
         except Exception as e:
             if e.status == 409:
                 log2(f"Error: '{pod_name}' already exists in namespace '{state.namespace}'.")

{kaqing-1.98.89 → kaqing-1.98.90}/adam/commands/deploy/deploy_pod.py

@@ -57,7 +57,9 @@ class DeployPod(Command):
         )
         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)
+        uri = deploy_frontend(pod_name, state.namespace, label_selector)
+
+        Pods.wait_for_running(state.namespace, pod_name, msg=f'Ops pod is starting up; it will be available at {uri}.')
 
         return state
 

{kaqing-1.98.89 → kaqing-1.98.90}/adam/commands/deploy/deploy_utils.py

@@ -15,7 +15,7 @@ def deploy_frontend(name: str, namespace: str, label_selector: str):
         'nginx.ingress.kubernetes.io/rewrite-target': '/'
     }, labels=labels)
 
-    log2(f'Shortly, ops pod will become available at https://{app_session.host}/c3/c3/ops')
+    return f'https://{app_session.host}/c3/c3/ops'
 
 def undeploy_frontend(namespace: str, label_selector: str):
     Ingresses.delete_ingresses(namespace, label_selector=label_selector)

{kaqing-1.98.89 → kaqing-1.98.90}/adam/k8s_utils/pods.py

@@ -213,12 +213,14 @@ class Pods:
             ))
         )
 
-    def wait_for_running(namespace: str, pod_name: str):
+    def wait_for_running(namespace: str, pod_name: str, msg: str=None):
         msged = False
 
         while Pods.get(namespace, pod_name).status.phase != 'Running':
             if not msged:
-                log2(f'Waiting for the {pod_name} pod to start up...')
+                if not msg:
+                    msg = f'Waiting for the {pod_name} pod to start up...'
+                log2(msg)
                 msged = True
             time.sleep(5)
 

kaqing-1.98.90/adam/version.py

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

{kaqing-1.98.89 → kaqing-1.98.90}/kaqing.egg-info/PKG-INFO

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

{kaqing-1.98.89 → kaqing-1.98.90}/setup.py

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

kaqing-1.98.89/adam/version.py

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