airship
/
armada
Code Issues Proposed changes

Merge "Fix existing release / upgrade logging"

This commit is contained in:
Zuul 2018-10-30 19:33:50 +00:00 committed by Gerrit Code Review
parent 32baf9851e bceb845d03
commit 36a21b86a7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
armada/handlers/chart_deploy.py
View File

@ -111,7 +111,7 @@ class ChartDeploy(object):
if status == const.STATUS_DEPLOYED: if status == const.STATUS_DEPLOYED:
# indicate to the end user what path we are taking # indicate to the end user what path we are taking
LOG.info("Upgrading release %s in namespace %s", release_name, LOG.info("Existing release %s found in namespace %s", release_name,
namespace) namespace)
# extract the installed chart and installed values from the # extract the installed chart and installed values from the
@ -124,7 +124,6 @@ class ChartDeploy(object):
force = upgrade.get('force', False) force = upgrade.get('force', False)
recreate_pods = upgrade.get('recreate_pods', False) recreate_pods = upgrade.get('recreate_pods', False)
LOG.info("Checking Pre/Post Actions")
if upgrade: if upgrade:
upgrade_pre = upgrade.get('pre', {}) upgrade_pre = upgrade.get('pre', {})
upgrade_post = upgrade.get('post', {}) upgrade_post = upgrade.get('post', {})
@ -159,8 +158,10 @@ class ChartDeploy(object):
# do actual update # do actual update
timer = int(round(deadline - time.time())) timer = int(round(deadline - time.time()))
LOG.info('Beginning Upgrade, wait=%s, timeout=%ss', LOG.info(
native_wait_enabled, timer) "Upgrading release %s in namespace %s, wait=%s, "
"timeout=%ss", release_name, namespace, native_wait_enabled,
timer)
tiller_result = self.tiller.update_release( tiller_result = self.tiller.update_release(
new_chart, new_chart,
release_name, release_name,
@ -180,12 +181,11 @@ class ChartDeploy(object):
# process install # process install
else: else:
LOG.info("Installing release %s in namespace %s", release_name,
namespace)
timer = int(round(deadline - time.time())) timer = int(round(deadline - time.time()))
LOG.info('Beginning Install, wait=%s, timeout=%ss', LOG.info(
native_wait_enabled, timer) "Installing release %s in namespace %s, wait=%s, "
"timeout=%ss", release_name, namespace, native_wait_enabled,
timer)
tiller_result = self.tiller.install_release( tiller_result = self.tiller.install_release(
new_chart, new_chart,
release_name, release_name,