Merge pull request #157 from shiftstack/bz-1886848

Bug 1886848: Save status before patching machine annotations
openshift · Jan 22, 2021 · 471cf3a · 471cf3a
2 parents e9a2d1f + 4f41902
commit 471cf3a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/cloud/openstack/machine/actuator.go b/pkg/cloud/openstack/machine/actuator.go
@@ -576,6 +576,8 @@ func (oc *OpenstackClient) handleMachineError(machine *machinev1.Machine, err *a
 }
 
 func (oc *OpenstackClient) updateAnnotation(machine *machinev1.Machine, instanceID string, clusterInfraName string) error {
+	statusCopy := *machine.Status.DeepCopy()
+
 	if machine.ObjectMeta.Annotations == nil {
 		machine.ObjectMeta.Annotations = make(map[string]string)
 	}
@@ -624,6 +626,7 @@ func (oc *OpenstackClient) updateAnnotation(machine *machinev1.Machine, instance
 		}
 	}
 
+	machine.Status = statusCopy
 	return oc.updateInstanceStatus(machine)
 }