Merge pull request #30138 from gmarek/flags

Automatic merge from submit-queue

Expose flags for new NodeEviction logic in NodeController

Fix #28832
Last PR from the NodeController NodeEviction logic series. 

cc @davidopp @lavalamp @mml

pkg/controller/node/controller_utils.go

@@ -40,31 +40,6 @@ const (
 	LargeClusterThreshold = 20
 )
 
-// This function is expected to get a slice of NodeReadyConditions for all Nodes in a given zone.
-// The zone is considered:
-// - fullyDisrupted if there're no Ready Nodes,
-// - partiallyDisrupted if more than 1/3 of Nodes (at least 3) are not Ready,
-// - normal otherwise
-func ComputeZoneState(nodeReadyConditions []*api.NodeCondition) zoneState {
-	readyNodes := 0
-	notReadyNodes := 0
-	for i := range nodeReadyConditions {
-		if nodeReadyConditions[i] != nil && nodeReadyConditions[i].Status == api.ConditionTrue {
-			readyNodes++
-		} else {
-			notReadyNodes++
-		}
-	}
-	switch {
-	case readyNodes == 0 && notReadyNodes > 0:
-		return stateFullDisruption
-	case notReadyNodes > 2 && 2*notReadyNodes > readyNodes:
-		return statePartialDisruption
-	default:
-		return stateNormal
-	}
-}
-
 // cleanupOrphanedPods deletes pods that are bound to nodes that don't
 // exist.
 func cleanupOrphanedPods(pods []*api.Pod, nodeStore cache.Store, forcefulDeletePodFunc func(*api.Pod) error) {
@@ -361,15 +336,3 @@ func terminatePods(kubeClient clientset.Interface, recorder record.EventRecorder
 	}
 	return complete, nextAttempt, nil
 }
-
-func HealthyQPSFunc(nodeNum int, defaultQPS float32) float32 {
-	return defaultQPS
-}
-
-// If the cluster is large make evictions slower, if they're small stop evictions altogether.
-func ReducedQPSFunc(nodeNum int, defaultQPS float32) float32 {
-	if nodeNum > LargeClusterThreshold {
-		return defaultQPS / 10
-	}
-	return 0
-}