kubeadm: change kubelet skew to apiserver to n-3

pacoxu · pacoxu · commit 534a0941e8d3 · 2023-09-22T20:46:29.000+08:00
diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
@@ -453,7 +453,8 @@ var (
 	MinimumControlPlaneVersion = getSkewedKubernetesVersion(-1)
 
 	// MinimumKubeletVersion specifies the minimum version of kubelet which kubeadm supports
-	MinimumKubeletVersion = getSkewedKubernetesVersion(-1)
+	// Refer to https://kubernetes.io/releases/version-skew-policy/#kubelet-1
+	MinimumKubeletVersion = getSkewedKubernetesVersion(-3)
 
 	// CurrentKubernetesVersion specifies current Kubernetes version supported by kubeadm
 	CurrentKubernetesVersion = getSkewedKubernetesVersion(0)
diff --git a/cmd/kubeadm/app/phases/upgrade/policy.go b/cmd/kubeadm/app/phases/upgrade/policy.go
@@ -35,7 +35,8 @@ const (
 	MaximumAllowedMinorVersionDowngradeSkew = 1
 
 	// MaximumAllowedMinorVersionKubeletSkew describes how many minor versions the control plane version and the kubelet can skew in a kubeadm cluster
-	MaximumAllowedMinorVersionKubeletSkew = 1
+	// Refer to https://kubernetes.io/releases/version-skew-policy/#kubelet-1
+	MaximumAllowedMinorVersionKubeletSkew = 3
 )
 
 // VersionSkewPolicyErrors describes version skew errors that might be seen during the validation process in EnforceVersionPolicies

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ const (`
`35`	`35`	`MaximumAllowedMinorVersionDowngradeSkew = 1`
`36`	`36`
`37`	`37`	`// MaximumAllowedMinorVersionKubeletSkew describes how many minor versions the control plane version and the kubelet can skew in a kubeadm cluster`
`38`		`- MaximumAllowedMinorVersionKubeletSkew = 1`
	`38`	`+ // Refer to https://kubernetes.io/releases/version-skew-policy/#kubelet-1`
	`39`	`+ MaximumAllowedMinorVersionKubeletSkew = 3`
`39`	`40`	`)`
`40`	`41`
`41`	`42`	`// VersionSkewPolicyErrors describes version skew errors that might be seen during the validation process in EnforceVersionPolicies`