minor changes for -o yaml support

Signed-off-by: Bella Khizgiyaev <[email protected]>
kubev2v · Sep 2, 2024 · a27f2b0 · a27f2b0
1 parent 9cd5d11
commit a27f2b0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/operator/config/crd/bases/forklift.konveyor.io_migrations.yaml b/operator/config/crd/bases/forklift.konveyor.io_migrations.yaml
@@ -377,12 +377,12 @@ spec:
                         The VM Namespace
                         Only relevant for an openshift source.
                       type: string
-                    operatingSystem:
-                      description: The Operating System detected by virt-v2v.
-                      type: string
                     newName:
                       description: The new name of the VM after matching DNS1123 requirements.
                       type: string
+                    operatingSystem:
+                      description: The Operating System detected by virt-v2v.
+                      type: string
                     phase:
                       description: Phase
                       type: string

diff --git a/operator/config/crd/bases/forklift.konveyor.io_plans.yaml b/operator/config/crd/bases/forklift.konveyor.io_plans.yaml
@@ -888,13 +888,13 @@ spec:
                             The VM Namespace
                             Only relevant for an openshift source.
                           type: string
-                        operatingSystem:
-                          description: The Operating System detected by virt-v2v.
-                          type: string
                         newName:
                           description: The new name of the VM after matching DNS1123
                             requirements.
                           type: string
+                        operatingSystem:
+                          description: The Operating System detected by virt-v2v.
+                          type: string
                         phase:
                           description: Phase
                           type: string

diff --git a/pkg/controller/plan/kubevirt.go b/pkg/controller/plan/kubevirt.go
@@ -970,7 +970,7 @@ func (r *KubeVirt) UpdateVmByConvertedConfig(vm *plan.VMStatus, pod *core.Pod, s
 			return
 		}
 		r.Log.Info("Setting the vm firmware ", vm.Firmware, "vmId", vm.ID)
-	case api.VSphere:
+
 		if vm.OperatingSystem, err = util.GetOperationSystemFromYaml(vmConf); err != nil {
 			err = liberr.Wrap(err)
 			return
@@ -1719,11 +1719,13 @@ func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume,
 			})
 	}
 
-	environment = append(environment,
-		core.EnvVar{
-			Name:  "V2V_NewName",
-			Value: vm.NewName,
-		})
+	if vm.NewName != "" {
+		environment = append(environment,
+			core.EnvVar{
+				Name:  "V2V_NewName",
+				Value: vm.NewName,
+			})
+	}
 
 	// pod annotations
 	annotations := map[string]string{}

diff --git a/pkg/controller/plan/util/kubevirtvmparser.go b/pkg/controller/plan/util/kubevirtvmparser.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	// Name.
-	Name = "virt-v2v-parser"
+	Name = "kubevirt-vm-parser"
 )
 
 // Package logger.