501815d587
This change ports the following kubernetes 1.30.6 patches which were
refactored slightly to allow for upstream changes
The following patches were applied cleanly:
kubelet-sort-isolcpus-allocation-when-SMT-enabled.patch
kubelet-cpumanager-disable-CFS-quota-throttling.patch
kubelet-cpumanager-keep-normal-containers-off-reserv.patch
kubelet-CFS-quota-throttling-for-non-integer-cpulimit.patch
The following patches were refactored:
kubeadm-create-platform-pods-with-zero-CPU-resources.patch
kubernetes-make-isolcpus-allocation-SMT-aware.patch
kubeadm-reduce-UpgradeManifestTimeout.patch
kubeadm-readiness-probe-timeout-core-dns.patch
Patch Identify-platform-pods-based-on-pod-or-namespace-labels.patch
is merged into kubelet-cpumanager-infra-pods-use-system-reserved-CP.patch
and renamed patch to
kubelet-cpumanager-platform-pods-on-reserved-cpus.patch
Patch Affinity-of-guaranteed-pod-to-non-isolated-CPUs.patch is
merged into kubelet-cpumanager-introduce-concept-of-isolated-CPU.patch
Test Plan:
PASS: Kubernetes package 1.30.6 builds properly.
PASS: Tested Kubernetes patches on a running system.
PASS: Run following make tests successfully:
make test WHAT=./pkg/kubelet/cm GOFLAGS="-v"
make test WHAT=./pkg/kubelet/cm/cpumanager GOFLAGS="-v"
make test WHAT=./pkg/kubelet/cm/cpumanager/state GOFLAGS="-v"
make test WHAT=./pkg/kubelet/cm/cpumanager/topology GOFLAGS="-v"
make test WHAT=./pkg/kubelet/cm/topologymanager GOFLAGS="-v"
make test WHAT=./pkg/kubelet/cm/devicemanager GOFLAGS="-v"
make test WHAT=./pkg/kubelet/cm/memorymanager GOFLAGS="-v"
make test WHAT=./pkg/kubelet/kuberuntime GOFLAGS="-v"
make test WHAT=./cmd/kubeadm/app/constants GOFLAGS="-v"
make test WHAT=./cmd/kubeadm/app/phases/controlplane GOFLAGS="-v"
make test WHAT=./pkg/kubelet/cm GOFLAGS="-v"
make test WHAT=./cmd/kubeadm/app/phases/addons/dns/ GOFLAGS="-v"
make test-cmd WHAT=kubeadm GOFLAGS="-v"
Story: 2011047
Task: 51563
Change-Id: Ib1ab2b83882dbe82c87a52d3d459fde6e771c1e8
Signed-off-by: Saba Touheed Mujawar <sabatouheed.mujawar@windriver.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 08425e565a3dff5d8b5b7cb2e9991280398cf21f Mon Sep 17 00:00:00 2001
|
|
From: Saba Touheed Mujawar <sabatouheed.mujawar@windriver.com>
|
|
Date: Fri, 17 Jan 2025 05:09:55 -0500
|
|
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: Saba Touheed Mujawar <sabatouheed.mujawar@windriver.com>
|
|
---
|
|
cmd/kubeadm/app/constants/constants.go | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
|
|
index 0a3e0a15fce..02357d557da 100644
|
|
--- a/cmd/kubeadm/app/constants/constants.go
|
|
+++ b/cmd/kubeadm/app/constants/constants.go
|
|
@@ -235,7 +235,7 @@ const (
|
|
KubeletHealthCheckTimeout = 4 * time.Minute
|
|
|
|
// UpgradeManifestsTimeout specifies the default timeout for upgradring static Pod manifests
|
|
- UpgradeManifestsTimeout = 5 * time.Minute
|
|
+ UpgradeManifestsTimeout = 3 * time.Minute
|
|
|
|
// PullImageRetry specifies how many times ContainerRuntime retries when pulling image failed
|
|
PullImageRetry = 5
|
|
--
|
|
2.25.1
|
|
|