Skip to content
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

Jump to bottom

✨ machineset: adjust preflight check to allow kubelet version skew of 3 for clusters running v1.28 and above #9222

Merged
merged 1 commit into from
Aug 17, 2023
+69 −5
Merged

✨ machineset: adjust preflight check to allow kubelet version skew of 3 for clusters running v1.28 and above #9222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions internal/controllers/machineset/machineset_preflight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ type preflightCheckErrorMessage *string
// the preflight checks fail.
const preflightFailedRequeueAfter = 15 * time.Second

var minVerKubernetesKubeletVersionSkewThree = semver.MustParse("1.28.0")

func (r *Reconciler) runPreflightChecks(ctx context.Context, cluster *clusterv1.Cluster, ms *clusterv1.MachineSet, action string) (_ ctrl.Result, message string, retErr error) {
log := ctrl.LoggerFrom(ctx)
// If the MachineSetPreflightChecks feature gate is disabled return early.
Expand Down Expand Up @@ -168,13 +170,18 @@ func (r *Reconciler) controlPlaneStablePreflightCheck(controlPlane *unstructured
func (r *Reconciler) kubernetesVersionPreflightCheck(cpSemver, msSemver semver.Version) preflightCheckErrorMessage {
// Check the Kubernetes version skew policy.
// => MS minor version cannot be greater than the Control Plane minor version.
// => MS minor version cannot be older than 2 minor versions of Control Plane.
// => MS minor version cannot be outside of the supported skew.
// Kubernetes skew policy: https://kubernetes.io/releases/version-skew-policy/#kubelet
if msSemver.Minor > cpSemver.Minor {
return pointer.String(fmt.Sprintf("MachineSet version (%s) and ControlPlane version (%s) do not conform to the kubernetes version skew policy as MachineSet version is higher than ControlPlane version (%q preflight failed)", msSemver.String(), cpSemver.String(), clusterv1.MachineSetPreflightCheckKubernetesVersionSkew))
}
if msSemver.Minor < cpSemver.Minor-2 {
return pointer.String(fmt.Sprintf("MachineSet version (%s) and ControlPlane version (%s) do not conform to the kubernetes version skew policy as MachineSet version is more than 2 minor versions older than the ControlPlane version (%q preflight failed)", msSemver.String(), cpSemver.String(), clusterv1.MachineSetPreflightCheckKubernetesVersionSkew))
minorSkew := uint64(3)
chrischdi marked this conversation as resolved.
Show resolved Hide resolved
// For Control Planes running Kubernetes < v1.28, the version skew policy for kubelets is two.
if cpSemver.LT(minVerKubernetesKubeletVersionSkewThree) {
minorSkew = 2
}
if msSemver.Minor < cpSemver.Minor-minorSkew {
return pointer.String(fmt.Sprintf("MachineSet version (%s) and ControlPlane version (%s) do not conform to the kubernetes version skew policy as MachineSet version is more than %d minor versions older than the ControlPlane version (%q preflight failed)", msSemver.String(), cpSemver.String(), minorSkew, clusterv1.MachineSetPreflightCheckKubernetesVersionSkew))
}

return nil
Expand Down
61 changes: 59 additions & 2 deletions internal/controllers/machineset/machineset_preflight_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ func TestMachineSetReconciler_runPreflightChecks(t *testing.T) {
}).
Build()

controlPlaneStable128 := builder.ControlPlane(ns, "cp1").
WithVersion("v1.28.0").
WithStatusFields(map[string]interface{}{
"status.version": "v1.28.0",
}).
Build()

t.Run("should run preflight checks if the feature gate is enabled", func(t *testing.T) {
defer utilfeature.SetFeatureGateDuringTest(t, feature.Gates, feature.MachineSetPreflightChecks, true)()

Expand Down Expand Up @@ -267,7 +274,32 @@ func TestMachineSetReconciler_runPreflightChecks(t *testing.T) {
wantPass: false,
},
{
name: "kubernetes version preflight check: should fail if the machine set minor version is 2 older than control plane minor version",
name: "kubernetes version preflight check: should fail if the machine set minor version is 4 older than control plane minor version for >= v1.28",
cluster: &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
},
Spec: clusterv1.ClusterSpec{
ControlPlaneRef: contract.ObjToRef(controlPlaneStable128),
},
},
controlPlane: controlPlaneStable128,
machineSet: &clusterv1.MachineSet{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
},
Spec: clusterv1.MachineSetSpec{
Template: clusterv1.MachineTemplateSpec{
Spec: clusterv1.MachineSpec{
Version: pointer.String("v1.24.0"),
},
},
},
},
wantPass: false,
},
{
name: "kubernetes version preflight check: should fail if the machine set minor version is 3 older than control plane minor version for < v1.28",
cluster: &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
Expand Down Expand Up @@ -320,7 +352,32 @@ func TestMachineSetReconciler_runPreflightChecks(t *testing.T) {
wantPass: true,
},
{
name: "kubernetes version preflight check: should pass if the machine set minor version and control plane version conform to kubernetes version skew policy",
name: "kubernetes version preflight check: should pass if the machine set minor version and control plane version conform to kubernetes version skew policy >= v1.28",
cluster: &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
},
Spec: clusterv1.ClusterSpec{
ControlPlaneRef: contract.ObjToRef(controlPlaneStable128),
},
},
controlPlane: controlPlaneStable128,
machineSet: &clusterv1.MachineSet{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
},
Spec: clusterv1.MachineSetSpec{
Template: clusterv1.MachineTemplateSpec{
Spec: clusterv1.MachineSpec{
Version: pointer.String("v1.25.0"),
},
},
},
},
wantPass: true,
},
{
name: "kubernetes version preflight check: should pass if the machine set minor version and control plane version conform to kubernetes version skew policy < v1.28",
cluster: &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Namespace: ns,
Expand Down