fix(vd): fix data volume watcher

Signed-off-by: Dmitry Rakitin <dmitry.rakitin@flant.com>

Author: Isteb4k

images/virtualization-artifact/hack/dlv-controller.Dockerfile

@@ -3,7 +3,6 @@ ARG TARGETOS
 ARG TARGETARCH
 
 WORKDIR /app/images/virtualization-artifact
-RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
 COPY ./images/virtualization-artifact/go.mod /app/images/virtualization-artifact/
 COPY ./images/virtualization-artifact/go.sum /app/images/virtualization-artifact/
@@ -24,8 +23,7 @@ RUN go build -tags EE -gcflags "all=-N -l" -a -o virtualization-controller ./cmd
 FROM busybox:1.36.1-glibc
 
 WORKDIR /app
-COPY --from=builder /go/bin/dlv /app/dlv
 COPY --from=builder /app/images/virtualization-artifact/virtualization-controller /app/virtualization-controller
 USER 65532:65532
 
-ENTRYPOINT ["./dlv", "--listen=:2345", "--headless=true", "--continue", "--log=true", "--log-output=debugger,debuglineerr,gdbwire,lldbout,rpc", "--accept-multiclient", "--api-version=2", "exec", "./virtualization-controller", "--"]
+ENTRYPOINT ["./virtualization-controller"]

images/virtualization-artifact/pkg/controller/vd/internal/watcher/datavolume_watcher.go

@@ -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 {

images/virtualization-artifact/pkg/controller/vi/internal/watcher/datavolume_watcher.go

@@ -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 {
@@ -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 {