Merge pull request #7351 from gottwald/ig/mutable-disk-setup

🌱 Make KCP diskSetup field mutable

Author: k8s-ci-robot

controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go

@@ -126,6 +126,7 @@ const (
 	scheduler            = "scheduler"
 	ntp                  = "ntp"
 	ignition             = "ignition"
+	diskSetup            = "diskSetup"
 )
 
 const minimumCertificatesExpiryDays = 7
@@ -156,6 +157,7 @@ func (in *KubeadmControlPlane) ValidateUpdate(old runtime.Object) error {
 		{spec, kubeadmConfigSpec, users},
 		{spec, kubeadmConfigSpec, ntp, "*"},
 		{spec, kubeadmConfigSpec, ignition, "*"},
+		{spec, kubeadmConfigSpec, diskSetup, "*"},
 		{spec, "machineTemplate", "metadata", "*"},
 		{spec, "machineTemplate", "infrastructureRef", "apiVersion"},
 		{spec, "machineTemplate", "infrastructureRef", "name"},

controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go

@@ -648,6 +648,16 @@ func TestKubeadmControlPlaneValidateUpdate(t *testing.T) {
 		Directory: "/tmp/patches",
 	}
 
+	updateDiskSetup := before.DeepCopy()
+	updateDiskSetup.Spec.KubeadmConfigSpec.DiskSetup = &bootstrapv1.DiskSetup{
+		Filesystems: []bootstrapv1.Filesystem{
+			{
+				Device:     "/dev/sda",
+				Filesystem: "ext4",
+			},
+		},
+	}
+
 	tests := []struct {
 		name                  string
 		enableIgnitionFeature bool
@@ -972,6 +982,12 @@ func TestKubeadmControlPlaneValidateUpdate(t *testing.T) {
 			before:    before,
 			kcp:       updateJoinConfigurationPatches,
 		},
+		{
+			name:      "should allow changes to diskSetup",
+			expectErr: false,
+			before:    before,
+			kcp:       updateDiskSetup,
+		},
 		{
 			name:      "should return error when rolloutBefore.certificatesExpiryDays is invalid",
 			expectErr: true,