diff --git a/operator/config/crd/bases/forklift.konveyor.io_migrations.yaml b/operator/config/crd/bases/forklift.konveyor.io_migrations.yaml index 3bcae59ea..ff0554bc6 100644 --- 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 index 27ed8e655..f6da3b769 100644 --- 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 index f131ea8d4..c3a3453b7 100644 --- a/pkg/controller/plan/kubevirt.go +++ b/pkg/controller/plan/kubevirt.go @@ -969,7 +969,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 diff --git a/pkg/controller/plan/util/kubevirtvmparser.go b/pkg/controller/plan/util/kubevirtvmparser.go index d54b79250..37ab5d95e 100644 --- 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.