Merge "bugfix: Looking in wrong place for upgrade options"

This commit is contained in:
Zuul 2019-01-18 22:52:15 +00:00 committed by Gerrit Code Review
commit b0d9506906
2 changed files with 6 additions and 4 deletions

View File

@ -121,8 +121,9 @@ class ChartDeploy(object):
upgrade = chart.get('upgrade', {})
disable_hooks = upgrade.get('no_hooks', False)
force = upgrade.get('force', False)
recreate_pods = upgrade.get('recreate_pods', False)
options = upgrade.get('options', {})
force = options.get('force', False)
recreate_pods = options.get('recreate_pods', False)
if upgrade:
upgrade_pre = upgrade.get('pre', {})

View File

@ -437,8 +437,9 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
if diff:
upgrade = chart.get('upgrade', {})
disable_hooks = upgrade.get('no_hooks', False)
force = upgrade.get('force', False)
recreate_pods = upgrade.get(
options = upgrade.get('options', {})
force = options.get('force', False)
recreate_pods = options.get(
'recreate_pods', False)
expected_update_release_calls.append(