diff --git a/armada/handlers/chart_deploy.py b/armada/handlers/chart_deploy.py index 30671fda..203a1459 100644 --- a/armada/handlers/chart_deploy.py +++ b/armada/handlers/chart_deploy.py @@ -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', {}) diff --git a/armada/tests/unit/handlers/test_armada.py b/armada/tests/unit/handlers/test_armada.py index 06321da0..d1a35dc1 100644 --- a/armada/tests/unit/handlers/test_armada.py +++ b/armada/tests/unit/handlers/test_armada.py @@ -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(