Skip to content

fix(vmop): missed reconcile #1457

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(vmop): missed reconcile #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/watcher/vd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ func (w VirtualDiskWatcher) Watch(mgr manager.Manager, ctr controller.Controller
if err := ctr.Watch(
source.Kind(mgr.GetCache(), &v1alpha2.VirtualDisk{},
handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, vd *v1alpha2.VirtualDisk) []reconcile.Request {
restoreUID, hasRestoreAnnotation := vd.Annotations[annotations.AnnVMOPRestore]
// Use when we deleting VD before creating new one. Order is important because VD may have restore annotation from previous restore.
restoreUID, hasRestoreAnnotation := vd.Annotations[annotations.AnnVMOPRestoreDeleted]
if !hasRestoreAnnotation {
restoreUID, hasRestoreAnnotation = vd.Annotations[annotations.AnnVMOPRestoreDeleted]
restoreUID, hasRestoreAnnotation = vd.Annotations[annotations.AnnVMOPRestore]
}

if !hasRestoreAnnotation {
Expand Down
5 changes: 3 additions & 2 deletions images/virtualization-artifact/pkg/controller/vmop/snapshot/internal/watcher/vmbda.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ func (w VMBlockDeviceAttachmentWatcher) Watch(mgr manager.Manager, ctr controlle
if err := ctr.Watch(
source.Kind(mgr.GetCache(), &v1alpha2.VirtualMachineBlockDeviceAttachment{},
handler.TypedEnqueueRequestsFromMapFunc(func(ctx context.Context, vmbda *v1alpha2.VirtualMachineBlockDeviceAttachment) []reconcile.Request {
restoreUID, hasRestoreAnnotation := vmbda.Annotations[annotations.AnnVMOPRestore]
// Use when we deleting VMBDA before creating new one. Order is important because VMBDA may have restore annotation from previous restore.
restoreUID, hasRestoreAnnotation := vmbda.Annotations[annotations.AnnVMOPRestoreDeleted]
if !hasRestoreAnnotation {
restoreUID, hasRestoreAnnotation = vmbda.Annotations[annotations.AnnVMOPRestoreDeleted]
restoreUID, hasRestoreAnnotation = vmbda.Annotations[annotations.AnnVMOPRestore]
}

if !hasRestoreAnnotation {
Expand Down
Loading