starlingx
/
config
Code Issues Proposed changes

Merge "Correct Kubernetes control-plane upgrade robustness skip_update_config"

This commit is contained in:
Zuul 2024-03-25 20:20:03 +00:00 committed by Gerrit Code Review
parent 839b9b554d 4522150c87
commit 85a548ffcc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -10271,8 +10271,7 @@ class ConductorManager(service.PeriodicService):
puppet_common.REPORT_STATUS_CFG: puppet_common.REPORT_STATUS_CFG:
puppet_common.REPORT_UPGRADE_CONTROL_PLANE puppet_common.REPORT_UPGRADE_CONTROL_PLANE
} }
self._config_apply_runtime_manifest(context, config_uuid, config_dict, self._config_apply_runtime_manifest(context, config_uuid, config_dict)
skip_update_config=True)
def handle_k8s_upgrade_control_plane_success(self, context, kube_upgrade_obj, host_uuid, def handle_k8s_upgrade_control_plane_success(self, context, kube_upgrade_obj, host_uuid,
new_state, fail_state): new_state, fail_state):

4
sysinv/sysinv/sysinv/sysinv/tests/conductor/test_manager.py
View File

@ -1711,7 +1711,7 @@ class ManagerTestCase(base.DbTestCase):
} }
mock_config_apply_runtime_manifest.assert_called_with(mock.ANY, '273cfafd-886d-43ec-9478-8328727b34cc', mock_config_apply_runtime_manifest.assert_called_with(mock.ANY, '273cfafd-886d-43ec-9478-8328727b34cc',
config_dict, skip_update_config=True) config_dict)
def test_handle_k8s_upgrade_control_plane_success_first_master(self): def test_handle_k8s_upgrade_control_plane_success_first_master(self):
# Create controller-0 # Create controller-0
@ -1813,7 +1813,7 @@ class ManagerTestCase(base.DbTestCase):
} }
mock_config_apply_runtime_manifest.assert_called_with(mock.ANY, '273cfafd-886d-43ec-9478-8328727b34cc', mock_config_apply_runtime_manifest.assert_called_with(mock.ANY, '273cfafd-886d-43ec-9478-8328727b34cc',
config_dict, skip_update_config=True) config_dict)
def test_handle_k8s_upgrade_control_plane_success_second_master(self): def test_handle_k8s_upgrade_control_plane_success_second_master(self):
# Create controller-0 # Create controller-0