Merge "Revert "Check for connectivity to the tiller postgres backend.""

sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py

@@ -3258,12 +3258,8 @@ class ArmadaHelper(object):
 
         # Wait for armada to be ready for cmd execution.
         # NOTE: make_armada_requests() also has retry mechanism
-        TIMEOUT_DELTA = 5
+        timeout = 30
-        TIMEOUT_SLEEP = 5
+        while True:
-        TIMEOUT_START_VALUE = 30
-
-        timeout = TIMEOUT_START_VALUE
-        while timeout > 0:
             try:
                 pods = self._kube.kube_get_pods_by_selector(
                     ARMADA_NAMESPACE,
@@ -3291,42 +3287,20 @@ class ArmadaHelper(object):
                         LOG.error("Failed to copy %s to %s, error: %s",
                                   src, dest_dir, stderr)
                         raise RuntimeError('armada pod not ready')
-                    break
+                    else:
+                        return True
+                    return True
 
             except Exception as e:
                 LOG.info("Could not get Armada service : %s " % e)
 
-            time.sleep(TIMEOUT_SLEEP)
+            if timeout <= 0:
-            timeout -= TIMEOUT_DELTA
-
-        if timeout <= 0:
-            LOG.error("Failed to get Armada service after {seconds} seconds.".
-                      format(seconds=TIMEOUT_START_VALUE))
-            return False
-
-        # We don't need to loop through the code that checks the pod's status
-        # again. Once the previous loop exits with pod 'Running' we can test
-        # the connectivity to the tiller postgres backend:
-        timeout = TIMEOUT_START_VALUE
-        while timeout > 0:
-            try:
-                _ = helm_utils.retrieve_helm_releases()
                 break
-            except exception.HelmTillerFailure:
+            time.sleep(5)
-                LOG.warn("Could not query Helm/Tiller releases")
+            timeout -= 5
-                time.sleep(TIMEOUT_SLEEP)
-                timeout -= TIMEOUT_DELTA
-                continue
-            except Exception as ex:
-                LOG.error("Unhandled exception : {error}".format(error=str(ex)))
-                return False
 
-        if timeout <= 0:
+        LOG.error("Failed to get Armada service after 30 seconds.")
-            LOG.error("Failed to query Helm/Tiller for {seconds} seconds.".
+        return False
-                      format(seconds=TIMEOUT_START_VALUE))
-            return False
-
-        return True
 
     def stop_armada_request(self):
         """A simple way to cancel an on-going manifest apply/rollback/delete

sysinv/sysinv/sysinv/sysinv/helm/utils.py

@@ -1,6 +1,6 @@
 # sim: tabstop=4 shiftwidth=4 softtabstop=4
 #
-# Copyright (c) 2019-2021 Wind River Systems, Inc.
+# Copyright (c) 2019 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #