use status updater to abstract enable/disable of VM status subresource

Signed-off-by: Michael Henriksen <[email protected]>
bk201 · Aug 17, 2020 · fd7f96d · fd7f96d
1 parent 77d5257
commit fd7f96d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/pkg/virt-controller/watch/snapshot.go b/pkg/virt-controller/watch/snapshot.go
@@ -35,6 +35,7 @@ import (
 	"kubevirt.io/client-go/kubecli"
 	"kubevirt.io/client-go/log"
 	"kubevirt.io/kubevirt/pkg/controller"
+	"kubevirt.io/kubevirt/pkg/util/status"
 )
 
 const (
@@ -62,9 +63,10 @@ type snapshotSource interface {
 }
 
 type vmSnapshotSource struct {
-	client   kubecli.KubevirtClient
-	vm       *kubevirtv1.VirtualMachine
-	snapshot *snapshotv1.VirtualMachineSnapshot
+	client          kubecli.KubevirtClient
+	vmStatusUpdater *status.VMStatusUpdater
+	vm              *kubevirtv1.VirtualMachine
+	snapshot        *snapshotv1.VirtualMachineSnapshot
 }
 
 func cacheKeyFunc(namespace, name string) string {
@@ -362,9 +364,10 @@ func (ctrl *SnapshotController) getSnapshotSource(vmSnapshot *snapshotv1.Virtual
 		}
 
 		return &vmSnapshotSource{
-			client:   ctrl.client,
-			vm:       vm,
-			snapshot: vmSnapshot,
+			client:          ctrl.client,
+			vmStatusUpdater: ctrl.vmStatusUpdater,
+			vm:              vm,
+			snapshot:        vmSnapshot,
 		}, nil
 	}
 
@@ -691,10 +694,9 @@ func (s *vmSnapshotSource) Lock() (bool, error) {
 
 	if vmCopy.Status.SnapshotInProgress == nil {
 		vmCopy.Status.SnapshotInProgress = &s.snapshot.Name
-		vmCopy, err = s.client.VirtualMachine(vmCopy.Namespace).UpdateStatus(vmCopy)
-		if err != nil {
-			return false, err
-		}
+		// unfortunately, status updater does not return the updated resource
+		// but the controller is watching VMs so will get notified
+		return false, s.vmStatusUpdater.UpdateStatus(vmCopy)
 	}
 
 	if !controller.HasFinalizer(vmCopy, sourceFinalizer) {
@@ -725,7 +727,7 @@ func (s *vmSnapshotSource) Unlock() error {
 	}
 
 	vmCopy.Status.SnapshotInProgress = nil
-	_, err = s.client.VirtualMachine(vmCopy.Namespace).UpdateStatus(vmCopy)
+	err = s.vmStatusUpdater.UpdateStatus(vmCopy)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/virt-controller/watch/snapshot_base.go b/pkg/virt-controller/watch/snapshot_base.go
@@ -37,6 +37,7 @@ import (
 	"kubevirt.io/client-go/kubecli"
 	"kubevirt.io/client-go/log"
 	"kubevirt.io/kubevirt/pkg/controller"
+	"kubevirt.io/kubevirt/pkg/util/status"
 )
 
 const (
@@ -78,6 +79,8 @@ type SnapshotController struct {
 	recorder record.EventRecorder
 
 	resyncPeriod time.Duration
+
+	vmStatusUpdater *status.VMStatusUpdater
 }
 
 // NewSnapshotController creates a new SnapshotController
@@ -106,6 +109,7 @@ func NewSnapshotController(
 		crdInformer:               crdInformer,
 		recorder:                  recorder,
 		resyncPeriod:              resyncPeriod,
+		vmStatusUpdater:           status.NewVMStatusUpdater(client),
 	}
 
 	ctrl.dynamicInformerMap = map[string]*dynamicInformer{