Skip to content

Commit

Permalink
Refactoring the OVA NFS
Browse files Browse the repository at this point in the history 
Signed-off-by: Liran Rotenberg <[email protected]>
  • Loading branch information
@liranr23
liranr23 committed Sep 26, 2023
1 parent 675add6 commit 0bd0a51
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 92 deletions.
82 changes: 47 additions & 35 deletions pkg/controller/plan/kubevirt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
libcnd "github.com/konveyor/forklift-controller/pkg/lib/condition"
liberr "github.com/konveyor/forklift-controller/pkg/lib/error"
core "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
k8serr "k8s.io/apimachinery/pkg/api/errors"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down Expand Up @@ -1185,7 +1184,10 @@ func (r *KubeVirt) findTemplate(vm *plan.VMStatus) (tmpl *template.Template, err
}

func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume, configMap *core.ConfigMap, pvcs *[]core.PersistentVolumeClaim, v2vSecret *core.Secret) (pod *core.Pod, err error) {
volumes, volumeMounts, volumeDevices := r.podVolumeMounts(vmVolumes, configMap, pvcs)
volumes, volumeMounts, volumeDevices, err := r.podVolumeMounts(vmVolumes, configMap, pvcs)
if err != nil {
return
}

// qemu group
fsGroup := qemuGroup
Expand Down Expand Up @@ -1291,7 +1293,7 @@ func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume,
return
}

func (r *KubeVirt) podVolumeMounts(vmVolumes []cnv.Volume, configMap *core.ConfigMap, pvcs *[]core.PersistentVolumeClaim) (volumes []core.Volume, mounts []core.VolumeMount, devices []core.VolumeDevice) {
func (r *KubeVirt) podVolumeMounts(vmVolumes []cnv.Volume, configMap *core.ConfigMap, pvcs *[]core.PersistentVolumeClaim) (volumes []core.Volume, mounts []core.VolumeMount, devices []core.VolumeDevice, err error) {
pvcsByName := make(map[string]core.PersistentVolumeClaim)
for _, pvc := range *pvcs {
pvcsByName[pvc.Name] = pvc
Expand Down Expand Up @@ -1341,14 +1343,21 @@ func (r *KubeVirt) podVolumeMounts(vmVolumes []cnv.Volume, configMap *core.Confi
// If the provider runs in a different namespace then the destination VM,
// we need to create the PV and PVC to access the NFS.
if r.Plan.Spec.TargetNamespace != r.Source.Provider.Namespace {
r.CreatePvcForNfs(pvcName)
err = r.CreatePvForNfs()
if err != nil {
return
}
err = r.CreatePvcForNfs(pvcName)
if err != nil {
return
}
}

//path from disk
volumes = append(volumes, core.Volume{
Name: "nfs-pvc",
Name: "nfs-pv",
VolumeSource: core.VolumeSource{
PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{
PersistentVolumeClaim: &core.PersistentVolumeClaimVolumeSource{
ClaimName: pvcName,
},
},
Expand Down Expand Up @@ -1832,38 +1841,30 @@ func (r *KubeVirt) EnsurePersistentVolume(vmRef ref.Ref, persistentVolumes []cor
return
}

func (r *KubeVirt) CreatePvcForNfs(pvcName string) (err error) {
//TODO: set ownerReferenceso the PV and PVC deleted once the plan is done.
// ownerReference := meta.OwnerReference{
// APIVersion: "forklift.konveyor.io/v1beta1",
// Kind: "Plan",
// Name: r.Plan.Name,
// UID: r.Plan.UID,
// }

func (r *KubeVirt) CreatePvForNfs() (err error) {
sourceProvider := r.Source.Provider
pvName := fmt.Sprintf("ova-server-pv-%s", r.Plan.Name)
splitted := strings.Split(sourceProvider.Spec.URL, ":")

if len(splitted) != 2 {
r.Log.Error(nil, "NFS server path doesn't contains :")
r.Log.Error(nil, "NFS server path doesn't contains: ", "url", sourceProvider.Spec.URL)
return fmt.Errorf("bad source provider %s URL %s", sourceProvider.Name, sourceProvider.Spec.URL)
}
nfsServer := splitted[0]
nfsPath := splitted[1]

pv := &v1.PersistentVolume{
pvName := fmt.Sprintf("ova-server-pv-%s", r.Plan.Name)
pv := &core.PersistentVolume{
ObjectMeta: meta.ObjectMeta{
Name: pvName,
},
Spec: v1.PersistentVolumeSpec{
Capacity: v1.ResourceList{
v1.ResourceStorage: resource.MustParse("1Gi"),
Spec: core.PersistentVolumeSpec{
Capacity: core.ResourceList{
core.ResourceStorage: resource.MustParse("1Gi"),
},
AccessModes: []v1.PersistentVolumeAccessMode{
v1.ReadOnlyMany,
AccessModes: []core.PersistentVolumeAccessMode{
core.ReadOnlyMany,
},
PersistentVolumeSource: v1.PersistentVolumeSource{
NFS: &v1.NFSVolumeSource{
PersistentVolumeSource: core.PersistentVolumeSource{
NFS: &core.NFSVolumeSource{
Path: nfsPath,
Server: nfsServer,
},
Expand All @@ -1875,21 +1876,33 @@ func (r *KubeVirt) CreatePvcForNfs(pvcName string) (err error) {
r.Log.Error(err, "Failed to create OVA plan PV")
return
}
return
}

func (r *KubeVirt) CreatePvcForNfs(pvcName string) (err error) {
//TODO: set ownerReferences the PV and PVC deleted once the plan is done.
// ownerReference := meta.OwnerReference{
// APIVersion: "forklift.konveyor.io/v1beta1",
// Kind: "Plan",
// Name: r.Plan.Name,
// UID: r.Plan.UID,
// }

sc := ""
pvc := &v1.PersistentVolumeClaim{
pvName := fmt.Sprintf("ova-server-pv-%s", r.Plan.Name)
pvc := &core.PersistentVolumeClaim{
ObjectMeta: meta.ObjectMeta{
Name: pvcName,
Namespace: r.Plan.Spec.TargetNamespace,
},
Spec: v1.PersistentVolumeClaimSpec{
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{
v1.ResourceStorage: resource.MustParse("1Gi"),
Spec: core.PersistentVolumeClaimSpec{
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
core.ResourceStorage: resource.MustParse("1Gi"),
},
},
AccessModes: []v1.PersistentVolumeAccessMode{
v1.ReadOnlyMany,
AccessModes: []core.PersistentVolumeAccessMode{
core.ReadOnlyMany,
},
VolumeName: pvName,
StorageClassName: &sc,
Expand All @@ -1913,10 +1926,9 @@ func (r *KubeVirt) CreatePvcForNfs(pvcName string) (err error) {
select {
case <-timeout:
r.Log.Error(err, "Timed out waiting for PVC to be bound")
return
return fmt.Errorf("timeout passed waiting for the OVA PVC %v", pvc)
case <-tick:
err = r.Get(context.TODO(), pvcNamespacedName, pvc)
fmt.Print("this is pvc: ", pvc)
if err != nil {
r.Log.Error(err, "Failed to bound OVA plan PVC")
return
Expand Down
Loading

0 comments on commit 0bd0a51

Please sign in to comment.