Merge pull request #6 from deckhouse/removing-from-balancing-after-delay

removing a terminating machine from balancing after some delay

pkg/controller/machine.go

@@ -206,8 +206,6 @@ func (c *controller) reconcileClusterMachine(machine *v1alpha1.Machine) error {
 	}
 
 	if machine.DeletionTimestamp != nil {
-		c.setExcludeLBLabel(machine)
-
 		if c.safetyOptions.DrainDelay.Duration != 0 {
 			if machine.DeletionTimestamp.Add(c.safetyOptions.DrainDelay.Duration).After(time.Now()) {
 				klog.Infof("drain delay of %q has not yet passed for machine %q", c.safetyOptions.DrainDelay.Duration.String(), machine.Name)
@@ -216,6 +214,9 @@ func (c *controller) reconcileClusterMachine(machine *v1alpha1.Machine) error {
 			}
 		}
 
+		// removing the machine from balancing
+		c.setExcludeLBLabel(machine)
+
 		// Processing of delete event
 		if err := c.machineDelete(machine, driver); err != nil {
 			c.enqueueMachineAfter(machine, MachineEnqueueRetryPeriod)