UpdateStatus was not sufficient for certain snapshot controller updates

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

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/virt-controller/watch/snapshot.go b/pkg/virt-controller/watch/snapshot.go
@@ -688,7 +688,7 @@ func (s *vmSnapshotSource) Lock() (bool, error) {
 	vmCopy.Status.SnapshotInProgress = &s.snapshot.Name
 	controller.AddFinalizer(vmCopy, sourceFinalizer)
 
-	_, err := s.client.VirtualMachine(vmCopy.Namespace).UpdateStatus(vmCopy)
+	_, err := s.client.VirtualMachine(vmCopy.Namespace).Update(vmCopy)
 	if err != nil {
 		return false, err
 	}
@@ -705,7 +705,7 @@ func (s *vmSnapshotSource) Unlock() error {
 	vmCopy.Status.SnapshotInProgress = nil
 	controller.RemoveFinalizer(vmCopy, sourceFinalizer)
 
-	_, err := s.client.VirtualMachine(vmCopy.Namespace).UpdateStatus(vmCopy)
+	_, err := s.client.VirtualMachine(vmCopy.Namespace).Update(vmCopy)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/virt-controller/watch/snapshot_test.go b/pkg/virt-controller/watch/snapshot_test.go
@@ -531,7 +531,7 @@ var _ = Describe("Snapshot controlleer", func() {
 				updatedVM.Finalizers = []string{}
 				updatedVM.ResourceVersion = "1"
 				vmSource.Add(vm)
-				vmInterface.EXPECT().UpdateStatus(updatedVM).Return(updatedVM, nil)
+				vmInterface.EXPECT().Update(updatedVM).Return(updatedVM, nil)
 				addVirtualMachineSnapshot(vmSnapshot)
 				controller.processVMSnapshotWorkItem()
 			})
@@ -603,7 +603,7 @@ var _ = Describe("Snapshot controlleer", func() {
 				vmUpdate.Status.SnapshotInProgress = &vmSnapshotName
 
 				vmSource.Add(vm)
-				vmInterface.EXPECT().UpdateStatus(vmUpdate).Return(vmUpdate, nil)
+				vmInterface.EXPECT().Update(vmUpdate).Return(vmUpdate, nil)
 				addVirtualMachineSnapshot(vmSnapshot)
 				controller.processVMSnapshotWorkItem()
 			})
@@ -617,7 +617,7 @@ var _ = Describe("Snapshot controlleer", func() {
 				vmUpdate.Status.SnapshotInProgress = &vmSnapshotName
 
 				vmSnapshotSource.Add(vmSnapshot)
-				vmInterface.EXPECT().UpdateStatus(vmUpdate).Return(vmUpdate, nil)
+				vmInterface.EXPECT().Update(vmUpdate).Return(vmUpdate, nil)
 				addVM(vm)
 				controller.processVMSnapshotWorkItem()
 			})