Change Partition.Layout from bool to *bool

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

api/bootstrap/kubeadm/v1beta1/conversion_test.go

@@ -161,6 +161,13 @@ func hubKubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, c randfill.Continue
 		}
 		in.JoinConfiguration.NodeRegistration.KubeletExtraArgs[i] = arg
 	}
+
+	for i, p := range in.DiskSetup.Partitions {
+		if p.Layout == nil {
+			p.Layout = ptr.To(false) // Layout is a required field and nil does not round trip
+		}
+		in.DiskSetup.Partitions[i] = p
+	}
 }
 
 func hubNodeRegistrationOptions(in *bootstrapv1.NodeRegistrationOptions, c randfill.Continue) {

api/bootstrap/kubeadm/v1beta1/zz_generated.conversion.go

@@ -829,7 +829,7 @@ type Partition struct {
 	// If it is true, a single partition will be created for the entire device.
 	// When layout is false, it means don't partition or ignore existing partitioning.
 	// +required
-	Layout bool `json:"layout"`
+	Layout *bool `json:"layout,omitempty"`
 
 	// overwrite describes whether to skip checks and create the partition if a partition or filesystem is found on the device.
 	// Use with caution. Default is 'false'.

api/bootstrap/kubeadm/v1beta2/kubeadmconfig_types.go

@@ -164,6 +164,12 @@ func hubKubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, c randfill.Continue
 		}
 		in.JoinConfiguration.NodeRegistration.KubeletExtraArgs[i] = arg
 	}
+	for i, p := range in.DiskSetup.Partitions {
+		if p.Layout == nil {
+			p.Layout = ptr.To(false) // Layout is a required field and nil does not round trip
+		}
+		in.DiskSetup.Partitions[i] = p
+	}
 }
 
 func hubNodeRegistrationOptions(in *bootstrapv1.NodeRegistrationOptions, c randfill.Continue) {

api/bootstrap/kubeadm/v1beta2/zz_generated.deepcopy.go

@@ -148,7 +148,7 @@ func TestNewInitControlPlaneDiskMounts(t *testing.T) {
 				Partitions: []bootstrapv1.Partition{
 					{
 						Device:    "test-device",
-						Layout:    true,
+						Layout:    ptr.To(true),
 						Overwrite: ptr.To(false),
 						TableType: "gpt",
 					},

api/controlplane/kubeadm/v1beta1/conversion_test.go

@@ -102,7 +102,7 @@ func TestRender(t *testing.T) {
 					Partitions: []bootstrapv1.Partition{
 						{
 							Device:    "/dev/disk/azure/scsi1/lun0",
-							Layout:    true,
+							Layout:    ptr.To(true),
 							Overwrite: ptr.To(true),
 							TableType: "gpt",
 						},

bootstrap/kubeadm/internal/cloudinit/cloudinit_test.go

@@ -143,6 +143,12 @@ func hubKubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, c randfill.Continue
 		}
 		in.JoinConfiguration.NodeRegistration.KubeletExtraArgs[i] = arg
 	}
+	for i, p := range in.DiskSetup.Partitions {
+		if p.Layout == nil {
+			p.Layout = ptr.To(false) // Layout is a required field and nil does not round trip
+		}
+		in.DiskSetup.Partitions[i] = p
+	}
 }
 
 func hubNodeRegistrationOptions(in *bootstrapv1.NodeRegistrationOptions, c randfill.Continue) {

bootstrap/kubeadm/internal/ignition/clc/clc_test.go

@@ -141,6 +141,12 @@ func hubKubeadmConfigSpec(in *bootstrapv1.KubeadmConfigSpec, c randfill.Continue
 		}
 		in.JoinConfiguration.NodeRegistration.KubeletExtraArgs[i] = arg
 	}
+	for i, p := range in.DiskSetup.Partitions {
+		if p.Layout == nil {
+			p.Layout = ptr.To(false) // Layout is a required field and nil does not round trip
+		}
+		in.DiskSetup.Partitions[i] = p
+	}
 }
 
 func hubNodeRegistrationOptions(in *bootstrapv1.NodeRegistrationOptions, c randfill.Continue) {