ocp: preserve boot order for disks

Signed-off-by: Benny Zlotnik <bzlotnik@redhat.com>
kubev2v · Aug 14, 2023 · 6b4ca5a · 6b4ca5a
1 parent a2ec3ea
commit 6b4ca5a
Showing 1 changed file with 3 additions and 33 deletions.
diff --git a/pkg/controller/plan/adapter/ocp/builder.go b/pkg/controller/plan/adapter/ocp/builder.go
@@ -324,17 +324,7 @@ func (r *Builder) mapPVCsToTarget(targetVmSpec *cnv.VirtualMachineSpec, persiste
 				},
 			}
 			targetVmSpec.Template.Spec.Volumes = append(targetVmSpec.Template.Spec.Volumes, targetVolume)
-
-			targetDisk := cnv.Disk{
-				Name: disk.Name,
-				DiskDevice: cnv.DiskDevice{
-					Disk: &cnv.DiskTarget{
-						Bus: disk.Disk.Bus,
-					},
-				},
-			}
-
-			targetVmSpec.Template.Spec.Domain.Devices.Disks = append(targetVmSpec.Template.Spec.Domain.Devices.Disks, targetDisk)
+			targetVmSpec.Template.Spec.Domain.Devices.Disks = append(targetVmSpec.Template.Spec.Domain.Devices.Disks, *disk.DeepCopy())
 		}
 	}
 }
@@ -412,17 +402,7 @@ func (r *Builder) mapConfigMapsToTarget(targetVmSpec *cnv.VirtualMachineSpec, co
 		}
 
 		if disk, ok := diskMap[sourceConfigMap.Name]; ok {
-			targetDisk := cnv.Disk{
-				Name:   disk.Name,
-				Serial: disk.Serial,
-				DiskDevice: cnv.DiskDevice{
-					Disk: &cnv.DiskTarget{
-						Bus: disk.Disk.Bus,
-					},
-				},
-			}
-
-			targetVmSpec.Template.Spec.Domain.Devices.Disks = append(targetVmSpec.Template.Spec.Domain.Devices.Disks, targetDisk)
+			targetVmSpec.Template.Spec.Domain.Devices.Disks = append(targetVmSpec.Template.Spec.Domain.Devices.Disks, *disk.DeepCopy())
 		} else {
 			r.Log.Info("ConfigMap disk not found in diskMap, should never happen", "configMap", sourceConfigMap.Name)
 		}
@@ -462,17 +442,7 @@ func (r *Builder) mapSecretsToTarget(targetVmSpec *cnv.VirtualMachineSpec, secre
 		}
 
 		if disk, ok := diskMap[sourceSecret.Name]; ok {
-			targetDisk := cnv.Disk{
-				Name:   disk.Name,
-				Serial: disk.Serial,
-				DiskDevice: cnv.DiskDevice{
-					Disk: &cnv.DiskTarget{
-						Bus: disk.Disk.Bus,
-					},
-				},
-			}
-
-			targetVmSpec.Template.Spec.Domain.Devices.Disks = append(targetVmSpec.Template.Spec.Domain.Devices.Disks, targetDisk)
+			targetVmSpec.Template.Spec.Domain.Devices.Disks = append(targetVmSpec.Template.Spec.Domain.Devices.Disks, *disk.DeepCopy())
 		} else {
 			r.Log.Info("Secret disk not found in diskMap, should never happen", "secret", sourceSecret.Name)
 		}