starlingx/distcloud
Code Issues Proposed changes

Merge "DC kube upgrade robustness improvements"

Browse Source
This commit is contained in:
Zuul
2021-12-24 15:55:19 +00:00
committed by Gerrit Code Review
parent afbfc10a5b 462e3a90f0
commit 646b69a3c2
18 changed files with 559 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
distributedcloud/dcmanager/api/controllers/v1/sw_update_strategy.py
View File

@@ -42,6 +42,12 @@ SUPPORTED_STRATEGY_TYPES = [
consts.SW_UPDATE_TYPE_UPGRADE
]
# some strategies allow force for all subclouds
FORCE_ALL_TYPES = [
consts.SW_UPDATE_TYPE_KUBE_ROOTCA_UPDATE,
consts.SW_UPDATE_TYPE_KUBERNETES
]
class SwUpdateStrategyController(object):
@@ -161,8 +167,7 @@ class SwUpdateStrategyController(object):
if force_flag is not None:
if force_flag not in ["true", "false"]:
pecan.abort(400, _('force invalid'))
elif strategy_type != consts.SW_UPDATE_TYPE_KUBE_ROOTCA_UPDATE:
# kube rootca update allows force for all subclouds
elif strategy_type not in FORCE_ALL_TYPES:
if payload.get('cloud_name') is None:
pecan.abort(400,
_('The --force option can only be applied '