ceph-op: Remove taint check in "is node scheduable" func (#3063)

ceph-op: Remove taint check in "is node scheduable" func
This commit is contained in:
Alexander Trost authored and GitHub committed 2019-05-02 19:55:10 +02:00
commit 485c3c4e27
2 files changed
+5 -7

No files matched your search

+5 -1
View File
@@ -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 {
-6
View File
@@ -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
}