update proto to pass guestCofig struct update validation

Author: ushabelgur

broker/machinebroker/server/machine.go

@@ -251,9 +251,11 @@ func (s *Server) convertAggregateIronCoreMachine(aggIronCoreMachine *AggregateIr
 		return nil, err
 	}
 
-	var hostName string
+	var guestConfig *iri.GuestConfig
 	if aggIronCoreMachine.Machine.Spec.GuestConfig != nil {
-		hostName = aggIronCoreMachine.Machine.Spec.GuestConfig.Hostname
+		guestConfig = &iri.GuestConfig{
+			Hostname: aggIronCoreMachine.Machine.Spec.GuestConfig.Hostname,
+		}
 	}
 
 	return &iri.Machine{
@@ -264,7 +266,7 @@ func (s *Server) convertAggregateIronCoreMachine(aggIronCoreMachine *AggregateIr
 			IgnitionData:      ignitionData,
 			Volumes:           volumes,
 			NetworkInterfaces: nics,
-			HostName:          hostName,
+			GuestConfig:       guestConfig,
 		},
 		Status: &iri.MachineStatus{
 			ObservedGeneration: aggIronCoreMachine.Machine.Status.ObservedGeneration,

broker/machinebroker/server/machine_create.go

@@ -31,7 +31,11 @@ type IronCoreMachineConfig struct {
 	IgnitionData            []byte
 	NetworkInterfaceConfigs []*IronCoreNetworkInterfaceConfig
 	VolumeConfigs           []*IronCoreVolumeConfig
-	HostName                string
+	GuestConfig             *IroncoreGuestConfig
+}
+
+type IroncoreGuestConfig struct {
+	Hostname string
 }
 
 func (s *Server) ironcoreMachinePoolRef() *corev1.LocalObjectReference {
@@ -106,6 +110,12 @@ func (s *Server) getIronCoreMachineConfig(machine *iri.Machine) (*IronCoreMachin
 		return nil, fmt.Errorf("error preparing ironcore machine annotations: %w", err)
 	}
 
+	var ironcoreGuestConfig *IroncoreGuestConfig
+	if machine.Spec.GuestConfig != nil {
+		ironcoreGuestConfig = &IroncoreGuestConfig{
+			Hostname: machine.Spec.GuestConfig.Hostname,
+		}
+	}
 	return &IronCoreMachineConfig{
 		Labels:                  labels,
 		Annotations:             annotations,
@@ -114,7 +124,7 @@ func (s *Server) getIronCoreMachineConfig(machine *iri.Machine) (*IronCoreMachin
 		IgnitionData:            machine.Spec.IgnitionData,
 		NetworkInterfaceConfigs: ironcoreNicCfgs,
 		VolumeConfigs:           ironcoreVolumeCfgs,
-		HostName:                machine.Spec.HostName,
+		GuestConfig:             ironcoreGuestConfig,
 	}, nil
 }
 
@@ -129,7 +139,6 @@ func (s *Server) createIronCoreMachine(
 	var (
 		ignitionRef    *commonv1alpha1.SecretKeySelector
 		ignitionSecret *corev1.Secret
-		guestConfig    *computev1alpha1.MachineGuestConfig
 	)
 	if ignitionData := cfg.IgnitionData; len(ignitionData) > 0 {
 		log.V(1).Info("Creating ironcore ignition secret")
@@ -181,9 +190,10 @@ func (s *Server) createIronCoreMachine(
 		}
 	}
 
-	if cfg.HostName != "" {
-		guestConfig = &computev1alpha1.MachineGuestConfig{
-			Hostname: cfg.HostName,
+	var ironcoreGuestConfig *computev1alpha1.MachineGuestConfig
+	if cfg.GuestConfig != nil {
+		ironcoreGuestConfig = &computev1alpha1.MachineGuestConfig{
+			Hostname: cfg.GuestConfig.Hostname,
 		}
 	}
 
@@ -205,7 +215,7 @@ func (s *Server) createIronCoreMachine(
 			NetworkInterfaces:   ironcoreMachineNics,
 			Volumes:             ironcoreMachineVolumes,
 			IgnitionRef:         ignitionRef,
-			GuestConfig:         guestConfig,
+			GuestConfig:         ironcoreGuestConfig,
 		},
 	}
 	log.V(1).Info("Creating ironcore machine")

broker/machinebroker/server/machine_create_test.go

@@ -40,7 +40,9 @@ var _ = Describe("CreateMachine", func() {
 							},
 						},
 					}},
-					HostName: "foo-machine",
+					GuestConfig: &iri.GuestConfig{
+						Hostname: "foo-machine",
+					},
 				},
 			},
 		})

internal/apis/compute/validation/machine.go

@@ -343,6 +343,16 @@ func validateMachineSpecUpdate(new, old *compute.MachineSpec, fldPath *field.Pat
 		}
 	}
 
+	if old.GuestConfig == nil && new.GuestConfig != nil && new.GuestConfig.Hostname != "" {
+		allErrs = append(allErrs, field.Invalid(fldPath.Child("guestConfig").Child("hostname"), new.GuestConfig.Hostname, "hostname must not be set if it was not set before"))
+	}
+
+	if old.GuestConfig != nil && old.GuestConfig.Hostname == "" {
+		if new.GuestConfig != nil && new.GuestConfig.Hostname != "" {
+			allErrs = append(allErrs, field.Invalid(fldPath.Child("guestConfig").Child("hostname"), new.GuestConfig.Hostname, "hostname must not be set if it was not set before"))
+		}
+	}
+
 	if old.GuestConfig != nil && old.GuestConfig.Hostname != "" {
 		if new.GuestConfig == nil || new.GuestConfig.Hostname == "" {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("guestConfig").Child("hostname"), nil, "hostname must not be cleared"))

internal/apis/compute/validation/machine_test.go

@@ -574,6 +574,34 @@ var _ = Describe("Machine", func() {
 			},
 			ContainElement(DuplicateField("spec.volume[1].name")),
 		),
+		Entry("set hostname if not set and guestConfig is not set",
+			&compute.Machine{
+				Spec: compute.MachineSpec{
+					GuestConfig: &compute.MachineGuestConfig{
+						Hostname: "foo-hostname",
+					},
+				},
+			},
+			&compute.Machine{
+				Spec: compute.MachineSpec{},
+			},
+			ContainElement(InvalidField("spec.guestConfig.hostname")),
+		),
+		Entry("set hostname if not set and guestConfig is set",
+			&compute.Machine{
+				Spec: compute.MachineSpec{
+					GuestConfig: &compute.MachineGuestConfig{
+						Hostname: "foo-hostname",
+					},
+				},
+			},
+			&compute.Machine{
+				Spec: compute.MachineSpec{
+					GuestConfig: &compute.MachineGuestConfig{},
+				},
+			},
+			ContainElement(InvalidField("spec.guestConfig.hostname")),
+		),
 		Entry("remove hostname if set",
 			&compute.Machine{
 				Spec: compute.MachineSpec{