Skip to content

feat(vd): add quota override label for PVC migration #2148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danilrwx merged 8 commits into from
Mar 25, 2026
Merged

feat(vd): add quota override label for PVC migration #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c5ad953
feat(vd): add quota override label for PVC migration
danilrwx Mar 25, 2026
4599790
refactor(vd): set quota override label directly in PVC ObjectMeta
danilrwx Mar 25, 2026
06b077d
refactor(vd): remove quota label after source PVC deletion
danilrwx Mar 25, 2026
2fbd131
refactor(vd): use Patch instead of Update to remove quota label
danilrwx Mar 25, 2026
523f124
fix(vd): ignore NotFound error when deleting source PVC
danilrwx Mar 25, 2026
481dee0
feat(vd): add quota override label to source PVC during migration
danilrwx Mar 25, 2026
9237a40
Revert "feat(vd): add quota override label to source PVC during migra…
danilrwx Mar 25, 2026
38dbb63
refactor(vd): simplify quota label removal with RawPatch
danilrwx Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions images/virtualization-artifact/pkg/common/object/object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,15 @@ func RemoveAnnotation(ctx context.Context, cl client.Client, obj client.Object,
}
return cl.Patch(ctx, obj, client.RawPatch(types.JSONPatchType, bytes))
}

func RemoveLabel(ctx context.Context, cl client.Client, obj client.Object, labelKey string) error {
if _, exist := obj.GetLabels()[labelKey]; !exist {
return nil
}
jsonOp := patch.WithRemove(fmt.Sprintf("/metadata/labels/%s", patch.EscapeJSONPointer(labelKey)))
bytes, err := patch.NewJSONPatch(jsonOp).Bytes()
if err != nil {
return err
}
return cl.Patch(ctx, obj, client.RawPatch(types.JSONPatchType, bytes))
}
15 changes: 14 additions & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
"github.com/deckhouse/virtualization-controller/pkg/common/object"
pvcspec "github.com/deckhouse/virtualization-controller/pkg/common/pvc"
commonvd "github.com/deckhouse/virtualization-controller/pkg/common/vd"
Expand Down Expand Up @@ -594,12 +595,18 @@ func (h MigrationHandler) handleComplete(ctx context.Context, vd *v1alpha2.Virtu
}

log.Info("Complete migration. Delete source PersistentVolumeClaim", slog.String("pvc.name", vd.Status.MigrationState.SourcePVC), slog.String("pvc.namespace", vd.Namespace))

err = h.deleteSourcePersistentVolumeClaim(ctx, vd)
if err != nil {
return err
}
log.Debug("Source PersistentVolumeClaim was deleted", slog.String("pvc.name", vd.Status.MigrationState.SourcePVC), slog.String("pvc.namespace", vd.Namespace))

// Remove quota override label from target PVC.
if err := object.RemoveLabel(ctx, h.client, targetPVC, annotations.QuotaExcludeLabel); err != nil && !k8serrors.IsNotFound(err) {
return fmt.Errorf("remove quota override label from target PVC: %w", err)
}

if sc := vd.Spec.PersistentVolumeClaim.StorageClass; sc != nil && *sc != "" {
vd.Status.StorageClassName = *sc
}
Expand Down Expand Up @@ -655,6 +662,9 @@ func (h MigrationHandler) createTargetPersistentVolumeClaim(ctx context.Context,
OwnerReferences: []metav1.OwnerReference{
service.MakeControllerOwnerReference(vd),
},
Labels: map[string]string{
annotations.QuotaExcludeLabel: annotations.QuotaExcludeValue,
},
},
Spec: ptr.Deref(
pvcspec.CreateSpec(&sc.Name, size, accessMode, volumeMode),
Expand Down Expand Up @@ -685,9 +695,12 @@ func (h MigrationHandler) deleteTargetPersistentVolumeClaim(ctx context.Context,

func (h MigrationHandler) deleteSourcePersistentVolumeClaim(ctx context.Context, vd *v1alpha2.VirtualDisk) error {
pvc, err := h.getSourcePersistentVolumeClaim(ctx, vd)
if pvc == nil || err != nil {
if err != nil && !k8serrors.IsNotFound(err) {
return err
}
if pvc == nil {
return nil
}

return deletePersistentVolumeClaim(ctx, pvc, h.client)
}
Expand Down
Loading