diff --git a/kubernetes/kubernetes-1.24.4/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch b/kubernetes/kubernetes-1.24.4/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch new file mode 100644 index 000000000..c12ee4f7b --- /dev/null +++ b/kubernetes/kubernetes-1.24.4/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch @@ -0,0 +1,33 @@ +From 52519a7549da1466d486c19dc5430850bcfdefee Mon Sep 17 00:00:00 2001 +From: Ramesh Kumar Sivanandam +Date: Fri, 15 Mar 2024 03:28:13 -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 +--- + 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 524a624c34f..37562342368 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 + diff --git a/kubernetes/kubernetes-1.24.4/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.24.4/debian/deb_folder/patches/series index 221517092..234dea2d4 100644 --- a/kubernetes/kubernetes-1.24.4/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.24.4/debian/deb_folder/patches/series @@ -13,3 +13,4 @@ kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch cpumanager-policy-static-test-refactor.patch kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch +kubeadm-reduce-UpgradeManifestTimeout.patch diff --git a/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch b/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch new file mode 100644 index 000000000..0d6f8424b --- /dev/null +++ b/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch @@ -0,0 +1,33 @@ +From e03a40ad73d4c0e01b52c9df85d2cd735d75d403 Mon Sep 17 00:00:00 2001 +From: Ramesh Kumar Sivanandam +Date: Fri, 15 Mar 2024 03:41: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 +--- + 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 524a624c34f..37562342368 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 + diff --git a/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series index a1a3f7aac..c42d6ce40 100644 --- a/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.25.3/debian/deb_folder/patches/series @@ -8,4 +8,4 @@ kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch Revert-kubeadm-remove-RemoveOldControlPlaneLabel.patch Revert-kubeadm-cleanup-the-master-taint-on-CP-nodes-.patch - +kubeadm-reduce-UpgradeManifestTimeout.patch diff --git a/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch b/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch new file mode 100644 index 000000000..cc740363d --- /dev/null +++ b/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch @@ -0,0 +1,33 @@ +From 1168a33565667c030f73b55df8c227a051e06b9e Mon Sep 17 00:00:00 2001 +From: Ramesh Kumar Sivanandam +Date: Fri, 15 Mar 2024 03:46:02 -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 +--- + 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 524a624c34f..37562342368 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 + diff --git a/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series index c463853d2..936326b77 100644 --- a/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.26.1/debian/deb_folder/patches/series @@ -7,3 +7,4 @@ kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch Affinity-of-guaranteed-pod-to-non-isolated-CPUs.patch kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch +kubeadm-reduce-UpgradeManifestTimeout.patch diff --git a/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch b/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch new file mode 100644 index 000000000..cd6355992 --- /dev/null +++ b/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch @@ -0,0 +1,33 @@ +From 80e2b61d4659c89f3f1684cef847d9b0b0318a0b Mon Sep 17 00:00:00 2001 +From: Ramesh Kumar Sivanandam +Date: Fri, 15 Mar 2024 03:47:21 -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 +--- + 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 b62b3e15476..4accf23e454 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 + diff --git a/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series index c463853d2..936326b77 100644 --- a/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.27.5/debian/deb_folder/patches/series @@ -7,3 +7,4 @@ kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch Affinity-of-guaranteed-pod-to-non-isolated-CPUs.patch kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch +kubeadm-reduce-UpgradeManifestTimeout.patch diff --git a/kubernetes/kubernetes-1.28.4/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch b/kubernetes/kubernetes-1.28.4/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch new file mode 100644 index 000000000..e5f9af6a9 --- /dev/null +++ b/kubernetes/kubernetes-1.28.4/debian/deb_folder/patches/kubeadm-reduce-UpgradeManifestTimeout.patch @@ -0,0 +1,33 @@ +From 341756eb57cea280d96e74f56d02033402cee133 Mon Sep 17 00:00:00 2001 +From: Ramesh Kumar Sivanandam +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 +--- + 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 + diff --git a/kubernetes/kubernetes-1.28.4/debian/deb_folder/patches/series b/kubernetes/kubernetes-1.28.4/debian/deb_folder/patches/series index c463853d2..936326b77 100644 --- a/kubernetes/kubernetes-1.28.4/debian/deb_folder/patches/series +++ b/kubernetes/kubernetes-1.28.4/debian/deb_folder/patches/series @@ -7,3 +7,4 @@ kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch Affinity-of-guaranteed-pod-to-non-isolated-CPUs.patch kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch +kubeadm-reduce-UpgradeManifestTimeout.patch