From 7cf8e99a8c9234cc1138d128bca795995dca5071 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Fri, 26 Apr 2019 12:54:17 +0200 Subject: [PATCH] ceph-op: Remove taint check in "is node scheduable" func This removes the unnecessary check for taints on nodes in the `GetNodeSchedulable()` function. This fixes that even though the user has specified `tolerations` for, e.g., `NoSchedule` taints, that would be ignored and the node(s) directly be "marked" as unschedulable. Signed-off-by: Alexander Trost --- pkg/operator/ceph/cluster/controller.go | 6 +++++- pkg/operator/k8sutil/node.go | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/operator/ceph/cluster/controller.go b/pkg/operator/ceph/cluster/controller.go index ae2d8e57e..62ded6cfe 100644 --- a/pkg/operator/ceph/cluster/controller.go +++ b/pkg/operator/ceph/cluster/controller.go @@ -195,8 +195,12 @@ func (c *ClusterController) onK8sNodeAdd(obj interface{}) { } for _, cluster := range c.clusterMap { + if k8sutil.NodeIsTolerable(*newNode, cephv1.GetOSDPlacement(cluster.Spec.Placement).Tolerations, false) == false { + logger.Debugf("Skipping -> Node is not tolerable for cluster %s", cluster.Namespace) + continue + } if cluster.Spec.Storage.UseAllNodes == false { - logger.Debugf("Skipping -> Do not use all Nodes") + logger.Debugf("Skipping -> Do not use all Nodes in cluster %s", cluster.Namespace) continue } if cluster.Info == nil { diff --git a/pkg/operator/k8sutil/node.go b/pkg/operator/k8sutil/node.go index 06e44e533..0bbd4874f 100644 --- a/pkg/operator/k8sutil/node.go +++ b/pkg/operator/k8sutil/node.go @@ -114,12 +114,6 @@ func GetNodeSchedulable(node v1.Node) bool { if node.Spec.Unschedulable { return false } - for i := range node.Spec.Taints { - if node.Spec.Taints[i].Effect == "NoSchedule" { - logger.Debugf("Node %s is unschedulable", node.Labels[v1.LabelHostname]) - return false - } - } return true }