Skip to content

fix(vd): fix data volume watcher #2292

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
Isteb4k merged 1 commit into from
Apr 28, 2026
Merged

fix(vd): fix data volume watcher #2292

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
7 changes: 5 additions & 2 deletions images/virtualization-artifact/pkg/controller/vd/internal/watcher/datavolume_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ func (w *DataVolumeWatcher) Watch(mgr manager.Manager, ctr controller.Controller
return true
}

if e.ObjectOld.Status.Phase != e.ObjectNew.Status.Phase && e.ObjectNew.Status.Phase == cdiv1.Succeeded {
return true
if e.ObjectOld.Status.Phase != e.ObjectNew.Status.Phase {
switch e.ObjectNew.Status.Phase {
case cdiv1.Succeeded, cdiv1.WaitForFirstConsumer, cdiv1.PendingPopulation:
return true
}
}

if e.ObjectOld.Status.ClaimName != e.ObjectNew.Status.ClaimName {
Expand Down
9 changes: 6 additions & 3 deletions images/virtualization-artifact/pkg/controller/vi/internal/watcher/datavolume_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,16 @@ func (w *DataVolumeWatcher) Watch(mgr manager.Manager, ctr controller.Controller
),
predicate.TypedFuncs[*cdiv1.DataVolume]{
CreateFunc: func(e event.TypedCreateEvent[*cdiv1.DataVolume]) bool { return false },
DeleteFunc: func(e event.TypedDeleteEvent[*cdiv1.DataVolume]) bool { return false },
UpdateFunc: func(e event.TypedUpdateEvent[*cdiv1.DataVolume]) bool {
if e.ObjectOld.Status.Progress != e.ObjectNew.Status.Progress {
return true
}

if e.ObjectOld.Status.Phase != e.ObjectNew.Status.Phase && e.ObjectNew.Status.Phase == cdiv1.Succeeded {
return true
if e.ObjectOld.Status.Phase != e.ObjectNew.Status.Phase {
switch e.ObjectNew.Status.Phase {
case cdiv1.Succeeded, cdiv1.WaitForFirstConsumer, cdiv1.PendingPopulation:
return true
}
}

if e.ObjectOld.Status.ClaimName != e.ObjectNew.Status.ClaimName {
Expand All @@ -77,6 +79,7 @@ func (w *DataVolumeWatcher) Watch(mgr manager.Manager, ctr controller.Controller
dvRunning := service.GetDataVolumeCondition(cdiv1.DataVolumeRunning, e.ObjectNew.Status.Conditions)
return dvRunning != nil && dvRunning.Reason == "Error"
},
DeleteFunc: func(e event.TypedDeleteEvent[*cdiv1.DataVolume]) bool { return false },
},
),
); err != nil {
Expand Down
Loading