Bugfix: Removed bug while draining nodes

prashanth26 · prashanth26 · commit 83af4001bf97 · 2018-04-18T11:08:53.000+02:00
The drain nodes logic was reading an older version of the object while making drain call, there by fetching the wrong last operation timestamp. This lead to forceful draining of nodes. This was fixed by updating the updateMachineStatus method to return the new object instead of the old one.
diff --git a/pkg/controller/machine.go b/pkg/controller/machine.go
@@ -518,9 +518,9 @@ func (c *controller) updateMachineStatus(
 	if err != nil {
 		// Keep retrying until update goes through
 		glog.V(3).Infof("Warning: Updated failed, retrying, error: %q", err)
-		c.updateMachineStatus(machine, lastOperation, currentStatus)
+		return c.updateMachineStatus(machine, lastOperation, currentStatus)
 	}
-	return machine, nil
+	return clone, nil
 }
 
 func (c *controller) updateMachineConditions(machine *v1alpha1.Machine, conditions []v1.NodeCondition) *v1alpha1.Machine {

Original file line number	Diff line number	Diff line change
`@@ -518,9 +518,9 @@ func (c *controller) updateMachineStatus(`
`518`	`518`	`if err != nil {`
`519`	`519`	`// Keep retrying until update goes through`
`520`	`520`	`glog.V(3).Infof("Warning: Updated failed, retrying, error: %q", err)`
`521`		`- c.updateMachineStatus(machine, lastOperation, currentStatus)`
	`521`	`+ return c.updateMachineStatus(machine, lastOperation, currentStatus)`
`522`	`522`	`}`
`523`		`- return machine, nil`
	`523`	`+ return clone, nil`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`func (c controller) updateMachineConditions(machine v1alpha1.Machine, conditions []v1.NodeCondition) *v1alpha1.Machine {`