From 244b29636cb6e4c494a4b971c414272b82a58eae Mon Sep 17 00:00:00 2001 From: Joao Victor Portal Date: Wed, 15 Feb 2023 20:31:11 -0300 Subject: [PATCH] Change pod rollout timeout for K8s root CA change The Puppet timeout for pod rollout in stages "trustbothcas" and "trustnewca" was recently changed from 600s to 3600s. In this commit, the timeouts for these stages in the kubernetes root CA update strategy are also updated. Test Plan: PASS: In a AIO-SX, execute the Kubernetes Root CA update through sw-manager strategy and check that it is completed successfully without reaching any timeout in stages "trustbothcas" and "trustnewca". PASS: In a AIO-SX, artificially make the pod rollout script hang for 15 minutes and check that the stages "trustbothcas" and "trustnewca" are still completed successfully. Closes-Bug: 2004594 Signed-off-by: Joao Victor Portal Change-Id: I96d04de95e424e15bd79f049be644909bb0dcff7 --- .../nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py | 4 ++-- nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py index 70c3d549..6158b8b6 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py @@ -28,8 +28,8 @@ from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.infrastructure_api') -# Allow 600 seconds to determine if a kube rootca host update has stalled -MAX_KUBE_ROOTCA_HOST_UPDATE_DURATION = 600 +# Allow 3600 seconds to determine if a kube rootca host update has stalled +MAX_KUBE_ROOTCA_HOST_UPDATE_DURATION = 3600 def host_state(host_uuid, host_name, host_personality, host_sub_functions, diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py index 218f7f25..8ceb8827 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py @@ -3358,7 +3358,7 @@ class AbstractKubeRootcaUpdatePodsStep(AbstractKubeRootcaUpdateStep): in_progress_state, fail_state, phase, - timeout_in_secs=600): + timeout_in_secs=3600): super(AbstractKubeRootcaUpdatePodsStep, self).__init__( step_name, success_state,