fixup! feat: support setting kubeadm ignorePreflightErrors

Author: dkoshkin

docs/content/customization/generic/node-registration.md

@@ -51,7 +51,7 @@ Applying this configuration will result in the following value being set:
 
 #### Worker node
 
-Taints for individual nodepools can be configured similarly:
+`ignorePreflightErrors` for individual nodepools can be configured similarly:
 
 ```yaml
 apiVersion: cluster.x-k8s.io/v1beta1

pkg/handlers/generic/mutation/noderegistration/inject_controlplane.go

@@ -85,21 +85,33 @@ func (h *nodeRegistrationControlPlanePatchHandler) Mutate(
 				"patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(),
 				"patchedObjectName", ctrlclient.ObjectKeyFromObject(obj),
 			).Info("adding nodeRegistration to control-plane node kubeadm config template")
-			if obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration == nil {
-				obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration = &bootstrapv1.InitConfiguration{}
-			}
-			if obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration == nil {
-				obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
-			}
-			obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration.NodeRegistration.IgnorePreflightErrors = append(
-				obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration.NodeRegistration.IgnorePreflightErrors,
-				nodeRegistrationVar.IgnorePreflightErrors...,
-			)
-			obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors = append(
-				obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors,
-				nodeRegistrationVar.IgnorePreflightErrors...,
-			)
+
+			setIgnorePreflightErrorsForControlPlane(obj, nodeRegistrationVar.IgnorePreflightErrors)
 
 			return nil
 		})
 }
+
+func setIgnorePreflightErrorsForControlPlane(
+	obj *controlplanev1.KubeadmControlPlaneTemplate,
+	ignorePreflightErrors []string,
+) {
+	if len(ignorePreflightErrors) == 0 {
+		return
+	}
+
+	if obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration == nil {
+		obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration = &bootstrapv1.InitConfiguration{}
+	}
+	if obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration == nil {
+		obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
+	}
+	obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration.NodeRegistration.IgnorePreflightErrors = append(
+		obj.Spec.Template.Spec.KubeadmConfigSpec.InitConfiguration.NodeRegistration.IgnorePreflightErrors,
+		ignorePreflightErrors...,
+	)
+	obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors = append(
+		obj.Spec.Template.Spec.KubeadmConfigSpec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors,
+		ignorePreflightErrors...,
+	)
+}

pkg/handlers/generic/mutation/noderegistration/inject_worker.go

@@ -85,14 +85,26 @@ func (h *nodeRegistrationWorkerPatchHandler) Mutate(
 				"patchedObjectKind", obj.GetObjectKind().GroupVersionKind().String(),
 				"patchedObjectName", ctrlclient.ObjectKeyFromObject(obj),
 			).Info("adding nodeRegistration options to worker node kubeadm config template")
-			if obj.Spec.Template.Spec.JoinConfiguration == nil {
-				obj.Spec.Template.Spec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
-			}
-			obj.Spec.Template.Spec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors = append(
-				obj.Spec.Template.Spec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors,
-				nodeRegistrationVar.IgnorePreflightErrors...,
-			)
+
+			setIgnorePreflightErrorsForWorkers(obj, nodeRegistrationVar.IgnorePreflightErrors)
 
 			return nil
 		})
 }
+
+func setIgnorePreflightErrorsForWorkers(
+	obj *bootstrapv1.KubeadmConfigTemplate,
+	ignorePreflightErrors []string,
+) {
+	if len(ignorePreflightErrors) == 0 {
+		return
+	}
+
+	if obj.Spec.Template.Spec.JoinConfiguration == nil {
+		obj.Spec.Template.Spec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
+	}
+	obj.Spec.Template.Spec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors = append(
+		obj.Spec.Template.Spec.JoinConfiguration.NodeRegistration.IgnorePreflightErrors,
+		ignorePreflightErrors...,
+	)
+}