Bugfix: Existing machine-object now adopts node-labels (#265)

Author: hardikdr

pkg/controller/machine.go

@@ -308,11 +308,26 @@ func (c *controller) updateMachineState(machine *v1alpha1.Machine) (*v1alpha1.Ma
 		return machine, err
 	}
 
-	clone, err := c.updateMachineConditions(machine, node.Status.Conditions)
+	machine, err = c.updateMachineConditions(machine, node.Status.Conditions)
 	if err != nil {
 		return machine, err
 	}
-	return clone, nil
+
+	clone := machine.DeepCopy()
+	if clone.Labels == nil {
+		clone.Labels = make(map[string]string)
+	}
+
+	if _, ok := clone.Labels["node"]; !ok {
+		clone.Labels["node"] = machine.Status.Node
+		machine, err = c.controlMachineClient.Machines(clone.Namespace).Update(clone)
+		if err != nil {
+			glog.Warningf("Machine update failed. Retrying, error: %s", err)
+			return machine, err
+		}
+	}
+
+	return machine, nil
 }
 
 /*

pkg/controller/machine_test.go

@@ -1070,6 +1070,12 @@ var _ = Describe("machine", func() {
 				Expect(actual.Status.LastOperation.Type).To(Equal(data.expect.machine.Status.LastOperation.Type))
 				Expect(actual.Status.LastOperation.Description).To(Equal(data.expect.machine.Status.LastOperation.Description))
 
+				if data.expect.machine.Labels != nil {
+					if _, ok := data.expect.machine.Labels["node"]; ok {
+						Expect(actual.Labels["node"]).To(Equal(data.expect.machine.Labels["node"]))
+					}
+				}
+
 				for i := range actual.Status.Conditions {
 					Expect(actual.Status.Conditions[i].Type).To(Equal(data.expect.machine.Status.Conditions[i].Type))
 					Expect(actual.Status.Conditions[i].Status).To(Equal(data.expect.machine.Status.Conditions[i].Status))
@@ -1243,6 +1249,38 @@ var _ = Describe("machine", func() {
 					}, nil, nil, nil),
 				},
 			}),
+			Entry("Machine object does not have node-label and node exists", &data{
+				setup: setup{
+					machines: newMachines(1, &machinev1.MachineTemplateSpec{
+						ObjectMeta: *newObjectMeta(objMeta, 0),
+					}, &machinev1.MachineStatus{
+						Node: "node",
+					}, nil, nil, nil),
+					nodes: []*corev1.Node{
+						&corev1.Node{
+							ObjectMeta: metav1.ObjectMeta{
+								Name: "node-0",
+							},
+						},
+					},
+				},
+				action: action{
+					machine: machineName,
+				},
+				expect: expect{
+					machine: newMachine(&machinev1.MachineTemplateSpec{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: "machine-0",
+						},
+					}, &machinev1.MachineStatus{
+						Node: "node",
+					}, nil, nil,
+						map[string]string{
+							"node": "node-0",
+						},
+					),
+				},
+			}),
 		)
 	})