From 60a2c2e81072a0ffe7e0fdfdfbccde0ee36de7b4 Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@zalando.de>
Date: Fri, 21 Dec 2018 16:31:03 +0100
Subject: [PATCH] Log conditions that prevent master pod migration
---
pkg/controller/node.go | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
index 974a1c54..b3e30cc9 100644
--- a/pkg/controller/node.go
+++ b/pkg/controller/node.go
@@ -58,15 +58,16 @@ func (c *Controller) nodeUpdate(prev, cur interface{}) {
return
}
- if util.MapContains(nodeCur.Labels, map[string]string{"master": "true"}) {
+ if !c.nodeIsReady(nodePrev) {
+ c.logger.Debugf("The decommissioned node %v should have already triggered master pod migration. Previous k8s-reported state of the node: %v", util.NameFromMeta(nodePrev.ObjectMeta), nodePrev)
return
}
- // do nothing if the node should have already triggered an update or
- // if only one of the label and the unschedulability criteria are met.
- if !c.nodeIsReady(nodePrev) || c.nodeIsReady(nodeCur) {
+ if c.nodeIsReady(nodeCur) {
+ c.logger.Debugf("The decommissioned node %v become schedulable again. Current k8s-reported state of the node: %v", util.NameFromMeta(nodeCur.ObjectMeta), nodeCur)
return
}
+
c.moveMasterPodsOffNode(nodeCur)
}
--
GitLab