ovirt: do not set empty features and clock

The features and clock settings are taken from the corresponding template in kubevirt, if exists, we do not want to override them with empty settings. Signed-off-by: Arik Hadas <[email protected]>
kubev2v · Nov 8, 2023 · 38418a3 · 38418a3
1 parent fe1ebc2
commit 38418a3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pkg/controller/plan/adapter/ovirt/builder.go b/pkg/controller/plan/adapter/ovirt/builder.go
@@ -359,12 +359,14 @@ func (r *Builder) mapInput(object *cnv.VirtualMachineSpec) {
 }
 
 func (r *Builder) mapClock(vm *model.Workload, object *cnv.VirtualMachineSpec) {
-	clock := cnv.Clock{
-		Timer: &cnv.Timer{},
+	if object.Template.Spec.Domain.Clock == nil {
+		object.Template.Spec.Domain.Clock = &cnv.Clock{
+			Timer: &cnv.Timer{},
+		}
 	}
+
 	timezone := cnv.ClockOffsetTimezone(vm.Timezone)
-	clock.Timezone = &timezone
-	object.Template.Spec.Domain.Clock = &clock
+	object.Template.Spec.Domain.Clock.Timezone = &timezone
 }
 
 func (r *Builder) mapMemory(vm *model.Workload, object *cnv.VirtualMachineSpec) {
@@ -397,7 +399,6 @@ func (r *Builder) mapFirmware(vm *model.Workload, cluster *model.Cluster, object
 	if serial == "" {
 		serial = vm.ID
 	}
-	features := &cnv.Features{}
 	firmware := &cnv.Firmware{
 		Serial: serial,
 		UUID:   types.UID(vm.ID),
@@ -415,7 +416,6 @@ func (r *Builder) mapFirmware(vm *model.Workload, cluster *model.Cluster, object
 	default:
 		firmware.Bootloader = &cnv.Bootloader{BIOS: &cnv.BIOS{}}
 	}
-	object.Template.Spec.Domain.Features = features
 	object.Template.Spec.Domain.Firmware = firmware
 }