6633522643
This modifies kubeadm UpgradeManifestTimeout from 5 minutes default to 3 minutes to reduce the unnecessary delay in retries during kubeadm-upgrade-apply failures. The typical control-plane upgrade of static pods is 75 to 85 seconds, so 3 minutes gives adequate buffer to complete the operation. TEST PLAN: PASS: All Kubernetes packages build successfully from 1.24 to 1.28. PASS: Perform k8s upgrade and verify kubeadm-upgrade-apply.log shows the UpgradeManifestTimeout value as 3 minutes. Partial-Bug: 2056326 Change-Id: Ief35c63dacc92af861525f03fa25ceb7b8253622 Signed-off-by: Ramesh Kumar Sivanandam <rameshkumar.sivanandam@windriver.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 341756eb57cea280d96e74f56d02033402cee133 Mon Sep 17 00:00:00 2001
|
|
From: Ramesh Kumar Sivanandam <rameshkumar.sivanandam@windriver.com>
|
|
Date: Fri, 15 Mar 2024 03:49:15 -0400
|
|
Subject: [PATCH] kubeadm: reduce UpgradeManifestTimeout
|
|
|
|
This modifies kubeadm UpgradeManifestTimeout from 5 minutes default
|
|
to 3 minutes to reduce the unnecessary delay in retries during
|
|
kubeadm-upgrade-apply failures.
|
|
|
|
The typical control-plane upgrade of static pods is 75 to 85 seconds,
|
|
so 3 minutes gives adequate buffer to complete the operation.
|
|
|
|
Signed-off-by: Ramesh Kumar Sivanandam <rameshkumar.sivanandam@windriver.com>
|
|
---
|
|
cmd/kubeadm/app/phases/upgrade/staticpods.go | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go
|
|
index 540c1549fff..b40bc76f0fc 100644
|
|
--- a/cmd/kubeadm/app/phases/upgrade/staticpods.go
|
|
+++ b/cmd/kubeadm/app/phases/upgrade/staticpods.go
|
|
@@ -46,7 +46,7 @@ import (
|
|
|
|
const (
|
|
// UpgradeManifestTimeout is timeout of upgrading the static pod manifest
|
|
- UpgradeManifestTimeout = 5 * time.Minute
|
|
+ UpgradeManifestTimeout = 3 * time.Minute
|
|
)
|
|
|
|
// StaticPodPathManager is responsible for tracking the directories used in the static pod upgrade transition
|
|
--
|
|
2.25.1
|
|
|