From bb2900169a9ee9543ffaa0e0d475d3034b9579b9 Mon Sep 17 00:00:00 2001 From: Arik Hadas Date: Wed, 6 Dec 2023 14:17:53 +0200 Subject: [PATCH] Set transfer network on the conversion pod Before version 2.4, the virt-v2v conversion pod operated on a local disk after the disk was retrieved by CDI. CDI considered the transfer network when transfering the data from vSphere. As from version 2.4, when running a cold-migration to the local cluster, virt-v2v is also responsible to connect to vSphere and retrieve the disk(s) from there, therefore it now needs to consider the transfer network that is selected as well. This patch adds the transfer network, if set, on the conversion pod in both cases. Signed-off-by: Arik Hadas --- pkg/controller/plan/kubevirt.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/controller/plan/kubevirt.go b/pkg/controller/plan/kubevirt.go index beda745b2..22b8893fa 100644 --- a/pkg/controller/plan/kubevirt.go +++ b/pkg/controller/plan/kubevirt.go @@ -1230,10 +1230,17 @@ func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume, if err != nil { return } + // pod annotations + annotations := map[string]string{} + if r.Plan.Spec.TransferNetwork != nil { + annotations[AnnDefaultNetwork] = path.Join( + r.Plan.Spec.TransferNetwork.Namespace, r.Plan.Spec.TransferNetwork.Name) + } // pod pod = &core.Pod{ ObjectMeta: meta.ObjectMeta{ Namespace: r.Plan.Spec.TargetNamespace, + Annotations: annotations, Labels: r.conversionLabels(vm.Ref, false), GenerateName: r.getGeneratedName(vm), },