Merge "bugfix: Looking in wrong place for upgrade options"
This commit is contained in:
commit
b0d9506906
|
@ -121,8 +121,9 @@ class ChartDeploy(object):
|
||||||
|
|
||||||
upgrade = chart.get('upgrade', {})
|
upgrade = chart.get('upgrade', {})
|
||||||
disable_hooks = upgrade.get('no_hooks', False)
|
disable_hooks = upgrade.get('no_hooks', False)
|
||||||
force = upgrade.get('force', False)
|
options = upgrade.get('options', {})
|
||||||
recreate_pods = upgrade.get('recreate_pods', False)
|
force = options.get('force', False)
|
||||||
|
recreate_pods = options.get('recreate_pods', False)
|
||||||
|
|
||||||
if upgrade:
|
if upgrade:
|
||||||
upgrade_pre = upgrade.get('pre', {})
|
upgrade_pre = upgrade.get('pre', {})
|
||||||
|
|
|
@ -437,8 +437,9 @@ class ArmadaHandlerTestCase(base.ArmadaTestCase):
|
||||||
if diff:
|
if diff:
|
||||||
upgrade = chart.get('upgrade', {})
|
upgrade = chart.get('upgrade', {})
|
||||||
disable_hooks = upgrade.get('no_hooks', False)
|
disable_hooks = upgrade.get('no_hooks', False)
|
||||||
force = upgrade.get('force', False)
|
options = upgrade.get('options', {})
|
||||||
recreate_pods = upgrade.get(
|
force = options.get('force', False)
|
||||||
|
recreate_pods = options.get(
|
||||||
'recreate_pods', False)
|
'recreate_pods', False)
|
||||||
|
|
||||||
expected_update_release_calls.append(
|
expected_update_release_calls.append(
|
||||||
|
|
Loading…
Reference in New Issue