Skip to content

Commit

Permalink
fix(vd): remove pv protection
Browse files Browse the repository at this point in the history 
Signed-off-by: Isteb4k <[email protected]>
  • Loading branch information
@Isteb4k
Isteb4k authored Aug 27, 2024
1 parent 1f2f380 commit aa489c4
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 71 deletions.
2 changes: 1 addition & 1 deletion crds/virtualdisk.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ spec:
type: array
description: |
A list of `VirtualMachines` that use the disk
example: [{ name: "VM100" }, { name: "VM200" }]
example: [{ name: "VM100" }]
items:
type: object
properties:
Expand Down
34 changes: 5 additions & 29 deletions images/virtualization-artifact/pkg/controller/service/disk_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ func (s DiskService) CleanUp(ctx context.Context, sup *supplements.Generator) (b
if err != nil {
return false, err
}
pv, err := s.GetPersistentVolume(ctx, pvc)
if err != nil {
return false, err
}

var resourcesHaveDeleted bool

Expand All @@ -123,20 +119,6 @@ func (s DiskService) CleanUp(ctx context.Context, sup *supplements.Generator) (b
}
}

if pv != nil {
resourcesHaveDeleted = true

err = s.protection.RemoveProtection(ctx, pv)
if err != nil {
return false, err
}

err = s.client.Delete(ctx, pv)
if err != nil && !k8serrors.IsNotFound(err) {
return false, err
}
}

return resourcesHaveDeleted || subResourcesHaveDeleted, nil
}

Expand All @@ -159,7 +141,9 @@ func (s DiskService) CleanUpSupplements(ctx context.Context, sup *supplements.Ge
if err != nil && !k8serrors.IsNotFound(err) {
return false, err
}
pvc, err := s.GetPersistentVolumeClaim(ctx, sup)

var pvc *corev1.PersistentVolumeClaim
pvc, err = s.GetPersistentVolumeClaim(ctx, sup)
if err != nil {
return false, err
}
Expand All @@ -177,13 +161,13 @@ func (s DiskService) CleanUpSupplements(ctx context.Context, sup *supplements.Ge
return hasDeleted, supplements.CleanupForDataVolume(ctx, s.client, sup, s.dvcrSettings)
}

func (s DiskService) Protect(ctx context.Context, owner client.Object, dv *cdiv1.DataVolume, pvc *corev1.PersistentVolumeClaim, pv *corev1.PersistentVolume) error {
func (s DiskService) Protect(ctx context.Context, owner client.Object, dv *cdiv1.DataVolume, pvc *corev1.PersistentVolumeClaim) error {
err := s.protection.AddOwnerRef(ctx, owner, pvc)
if err != nil {
return fmt.Errorf("failed to add owner ref for pvc: %w", err)
}

err = s.protection.AddProtection(ctx, dv, pvc, pv)
err = s.protection.AddProtection(ctx, dv, pvc)
if err != nil {
return fmt.Errorf("failed to add protection for disk's supplements: %w", err)
}
Expand Down Expand Up @@ -259,14 +243,6 @@ func (s DiskService) GetPersistentVolumeClaim(ctx context.Context, sup *suppleme
return helper.FetchObject(ctx, sup.PersistentVolumeClaim(), s.client, &corev1.PersistentVolumeClaim{})
}

func (s DiskService) GetPersistentVolume(ctx context.Context, pvc *corev1.PersistentVolumeClaim) (*corev1.PersistentVolume, error) {
if pvc == nil {
return nil, nil
}

return helper.FetchObject(ctx, types.NamespacedName{Name: pvc.Spec.VolumeName}, s.client, &corev1.PersistentVolume{})
}

func (s DiskService) CheckImportProcess(ctx context.Context, dv *cdiv1.DataVolume, pvc *corev1.PersistentVolumeClaim, storageClassName *string) error {
var err error

Expand Down
12 changes: 4 additions & 8 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,15 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
if err != nil {
return false, err
}
pv, err := ds.diskService.GetPersistentVolume(ctx, pvc)
if err != nil {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Info("Disk provisioning finished: clean up")

setPhaseConditionForFinishedDisk(pv, pvc, &condition, &vd.Status.Phase, supgen)
setPhaseConditionForFinishedDisk(pvc, &condition, &vd.Status.Phase, supgen)

// Protect Ready Disk and underlying PVC and PV.
err = ds.diskService.Protect(ctx, vd, nil, pvc, pv)
err = ds.diskService.Protect(ctx, vd, nil, pvc)
if err != nil {
return false, err
}
Expand All @@ -87,7 +83,7 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
}

return CleanUpSupplements(ctx, vd, ds)
case common.AnyTerminating(dv, pvc, pv):
case common.AnyTerminating(dv, pvc):
log.Info("Waiting for supplements to be terminated")
case dv == nil:
log.Info("Start import to PVC")
Expand Down Expand Up @@ -140,7 +136,7 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
vd.Status.Capacity = ds.diskService.GetCapacity(pvc)
vd.Status.Target.PersistentVolumeClaim = dv.Status.ClaimName

err = ds.diskService.Protect(ctx, vd, dv, pvc, pv)
err = ds.diskService.Protect(ctx, vd, dv, pvc)
if err != nil {
return false, err
}
Expand Down
12 changes: 4 additions & 8 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,15 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
if err != nil {
return false, err
}
pv, err := ds.diskService.GetPersistentVolume(ctx, pvc)
if err != nil {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Info("Disk provisioning finished: clean up")

setPhaseConditionForFinishedDisk(pv, pvc, &condition, &vd.Status.Phase, supgen)
setPhaseConditionForFinishedDisk(pvc, &condition, &vd.Status.Phase, supgen)

// Protect Ready Disk and underlying PVC and PV.
err = ds.diskService.Protect(ctx, vd, nil, pvc, pv)
err = ds.diskService.Protect(ctx, vd, nil, pvc)
if err != nil {
return false, err
}
Expand All @@ -109,7 +105,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
}

return CleanUpSupplements(ctx, vd, ds)
case common.AnyTerminating(pod, dv, pvc, pv):
case common.AnyTerminating(pod, dv, pvc):
log.Info("Waiting for supplements to be terminated")
case pod == nil:
log.Info("Start import to DVCR")
Expand Down Expand Up @@ -231,7 +227,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
vd.Status.Capacity = ds.diskService.GetCapacity(pvc)
vd.Status.Target.PersistentVolumeClaim = dv.Status.ClaimName

err = ds.diskService.Protect(ctx, vd, dv, pvc, pv)
err = ds.diskService.Protect(ctx, vd, dv, pvc)
if err != nil {
return false, err
}
Expand Down
12 changes: 4 additions & 8 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,15 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
if err != nil {
return false, err
}
pv, err := ds.diskService.GetPersistentVolume(ctx, pvc)
if err != nil {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Info("Disk provisioning finished: clean up")

setPhaseConditionForFinishedDisk(pv, pvc, &condition, &vd.Status.Phase, supgen)
setPhaseConditionForFinishedDisk(pvc, &condition, &vd.Status.Phase, supgen)

// Protect Ready Disk and underlying PVC and PV.
err = ds.diskService.Protect(ctx, vd, nil, pvc, pv)
err = ds.diskService.Protect(ctx, vd, nil, pvc)
if err != nil {
return false, err
}
Expand All @@ -96,7 +92,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
}

return CleanUpSupplements(ctx, vd, ds)
case common.AnyTerminating(dv, pvc, pv):
case common.AnyTerminating(dv, pvc):
log.Info("Waiting for supplements to be terminated")
case dv == nil:
log.Info("Start import to PVC")
Expand Down Expand Up @@ -171,7 +167,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
vd.Status.Capacity = ds.diskService.GetCapacity(pvc)
vd.Status.Target.PersistentVolumeClaim = dv.Status.ClaimName

err = ds.diskService.Protect(ctx, vd, dv, pvc, pv)
err = ds.diskService.Protect(ctx, vd, dv, pvc)
if err != nil {
return false, err
}
Expand Down
10 changes: 3 additions & 7 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,15 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
if err != nil {
return false, err
}
pv, err := ds.diskService.GetPersistentVolume(ctx, pvc)
if err != nil {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Info("Disk provisioning finished: clean up")

setPhaseConditionForFinishedDisk(pv, pvc, &condition, &vd.Status.Phase, supgen)
setPhaseConditionForFinishedDisk(pvc, &condition, &vd.Status.Phase, supgen)

// Protect Ready Disk and underlying PVC and PV.
err = ds.diskService.Protect(ctx, vd, nil, pvc, pv)
err = ds.diskService.Protect(ctx, vd, nil, pvc)
if err != nil {
return false, err
}
Expand Down Expand Up @@ -235,7 +231,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
vd.Status.Capacity = ds.diskService.GetCapacity(pvc)
vd.Status.Target.PersistentVolumeClaim = dv.Status.ClaimName

err = ds.diskService.Protect(ctx, vd, dv, pvc, pv)
err = ds.diskService.Protect(ctx, vd, dv, pvc)
if err != nil {
return false, err
}
Expand Down
3 changes: 1 addition & 2 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ func isDiskProvisioningFinished(c metav1.Condition) bool {
}

func setPhaseConditionForFinishedDisk(
pv *corev1.PersistentVolume,
pvc *corev1.PersistentVolumeClaim,
condition *metav1.Condition,
phase *virtv2.DiskPhase,
Expand All @@ -110,7 +109,7 @@ func setPhaseConditionForFinishedDisk(
condition.Status = metav1.ConditionFalse
condition.Reason = vdcondition.Lost
condition.Message = fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String())
case pv == nil:
case pvc.Status.Phase == corev1.ClaimLost:
*phase = virtv2.DiskLost
condition.Status = metav1.ConditionFalse
condition.Reason = vdcondition.Lost
Expand Down
10 changes: 3 additions & 7 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
if err != nil {
return false, err
}
pv, err := ds.diskService.GetPersistentVolume(ctx, pvc)
if err != nil {
return false, err
}

if vd.Status.UploadCommand == "" {
if ing != nil && ing.Annotations[common.AnnUploadURL] != "" {
Expand All @@ -103,10 +99,10 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
case isDiskProvisioningFinished(condition):
log.Info("Disk provisioning finished: clean up")

setPhaseConditionForFinishedDisk(pv, pvc, &condition, &vd.Status.Phase, supgen)
setPhaseConditionForFinishedDisk(pvc, &condition, &vd.Status.Phase, supgen)

// Protect Ready Disk and underlying PVC and PV.
err = ds.diskService.Protect(ctx, vd, nil, pvc, pv)
err = ds.diskService.Protect(ctx, vd, nil, pvc)
if err != nil {
return false, err
}
Expand Down Expand Up @@ -258,7 +254,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
vd.Status.Capacity = ds.diskService.GetCapacity(pvc)
vd.Status.Target.PersistentVolumeClaim = dv.Status.ClaimName

err = ds.diskService.Protect(ctx, vd, dv, pvc, pv)
err = ds.diskService.Protect(ctx, vd, dv, pvc)
if err != nil {
return false, err
}
Expand Down
2 changes: 1 addition & 1 deletion images/virtualization-artifact/pkg/controller/vd/vd_reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func (r *Reconciler) SetupController(_ context.Context, mgr manager.Manager, ctr
return true
}

return oldPVC.Status.Phase != newPVC.Status.Phase && newPVC.Status.Phase == corev1.ClaimBound
return oldPVC.Status.Phase != newPVC.Status.Phase
},
},
); err != nil {
Expand Down

0 comments on commit aa489c4

Please sign in to comment.