From 6f76f8bec749e0bfa663570312db85d3b1a87183 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Fri, 18 Jan 2019 15:57:52 -0600 Subject: [PATCH] bugfix: Looking in wrong place for upgrade options Fixes a bug where Armada Was looking for upgrade options (force, recreate_pods currently) underneath `upgrade` directly rather than `upgrade.options` where they are defined in the schema. Change-Id: Ia95129a19c87f5d59eaefccd04a7ac9e2acb0b3b --- armada/handlers/chart_deploy.py | 5 +++-- armada/tests/unit/handlers/test_armada.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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(