Merge pull request #111691 from alexanderConstantinescu/remove-sched-…

…pred-from-ccm [CCM - service controller] Remove schedulability predicate for LB set
kubernetes · Aug 4, 2022 · d0c92ae · d0c92ae
2 parents 897cdea + 59e90f4
commit d0c92ae
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 736 deletions.
diff --git a/staging/src/k8s.io/cloud-provider/controllers/service/controller.go b/staging/src/k8s.io/cloud-provider/controllers/service/controller.go
@@ -984,13 +984,11 @@ type NodeConditionPredicate func(node *v1.Node) bool
 var (
 	allNodePredicates []NodeConditionPredicate = []NodeConditionPredicate{
 		nodeIncludedPredicate,
-		nodeSchedulablePredicate,
 		nodeUnTaintedPredicate,
 		nodeReadyPredicate,
 	}
 	etpLocalNodePredicates []NodeConditionPredicate = []NodeConditionPredicate{
 		nodeIncludedPredicate,
-		nodeSchedulablePredicate,
 		nodeUnTaintedPredicate,
 	}
 )
@@ -1008,11 +1006,6 @@ func nodeIncludedPredicate(node *v1.Node) bool {
 	return !hasExcludeBalancerLabel
 }
 
-// We consider the node for load balancing only when the node is schedulable.
-func nodeSchedulablePredicate(node *v1.Node) bool {
-	return !node.Spec.Unschedulable
-}
-
 // We consider the node for load balancing only when its not tainted for deletion by the cluster autoscaler.
 func nodeUnTaintedPredicate(node *v1.Node) bool {
 	for _, taint := range node.Spec.Taints {