Skip to content

kubeadm: adjust kubeadm skew policy for upgrades #120825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 12, 2023
+33 −6
Merged

kubeadm: adjust kubeadm skew policy for upgrades #120825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
534a094
kubeadm: change kubelet skew to apiserver to n-3
pacoxu Sep 22, 2023
7b1d873
add kubelet policy skew test for kubeadm
pacoxu Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ var (
MinimumControlPlaneVersion = getSkewedKubernetesVersion(-1)

// MinimumKubeletVersion specifies the minimum version of kubelet which kubeadm supports
MinimumKubeletVersion = getSkewedKubernetesVersion(-1)
MinimumKubeletVersion = getSkewedKubernetesVersion(-3)

// CurrentKubernetesVersion specifies current Kubernetes version supported by kubeadm
CurrentKubernetesVersion = getSkewedKubernetesVersion(0)
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/phases/upgrade/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const (
MaximumAllowedMinorVersionDowngradeSkew = 1

// MaximumAllowedMinorVersionKubeletSkew describes how many minor versions the control plane version and the kubelet can skew in a kubeadm cluster
MaximumAllowedMinorVersionKubeletSkew = 1
MaximumAllowedMinorVersionKubeletSkew = 3
)

// VersionSkewPolicyErrors describes version skew errors that might be seen during the validation process in EnforceVersionPolicies
Expand Down
35 changes: 31 additions & 4 deletions cmd/kubeadm/app/phases/upgrade/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,24 @@ func TestEnforceVersionPolicies(t *testing.T) {
},
newK8sVersion: "v1.13.0",
expectedMandatoryErrs: 1, // can't upgrade two minor versions
},
{
name: "upgrading with n-3 kubelet is supported",
vg: &fakeVersionGetter{
clusterVersion: "v1.14.3",
kubeletVersion: "v1.12.3",
kubeadmVersion: "v1.15.0",
},
newK8sVersion: "v1.15.0",
},
{
name: "upgrading with n-4 kubelet is not supported",
vg: &fakeVersionGetter{
clusterVersion: "v1.14.3",
kubeletVersion: "v1.11.3",
kubeadmVersion: "v1.15.0",
},
newK8sVersion: "v1.15.0",
expectedSkippableErrs: 1, // kubelet <-> apiserver skew too large
},
{
Expand Down Expand Up @@ -123,13 +141,22 @@ func TestEnforceVersionPolicies(t *testing.T) {
expectedMandatoryErrs: 1,
},
{
name: "the maximum skew between the cluster version and the kubelet versions should be one minor version. This may be forced through though.",
name: "the maximum skew between the cluster version and the kubelet versions should be three minor version.",
vg: &fakeVersionGetter{
clusterVersion: "v1.13.0",
kubeletVersion: "v1.10.8",
kubeadmVersion: "v1.13.0",
},
newK8sVersion: "v1.13.0",
},
{
name: "the maximum skew between the cluster version and the kubelet versions should be three minor version. This may be forced through though.",
vg: &fakeVersionGetter{
clusterVersion: "v1.12.0",
clusterVersion: "v1.14.0",
kubeletVersion: "v1.10.8",
kubeadmVersion: "v1.12.0",
kubeadmVersion: "v1.14.0",
},
newK8sVersion: "v1.12.0",
newK8sVersion: "v1.14.0",
expectedSkippableErrs: 1,
},
{
Expand Down