Merge pull request kubernetes#18503 from aveshagarwal/master-rhbz-1540822

Automatic merge from submit-queue (batch tested with PRs 18503, 18399, 13701, 18513, 18515).

UPSTREAM: 59449: Fix to register priority function ResourceLimitsPriority correctly.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540822

Upstream PR is merged: kubernetes#59449

@derekwaynecarr

Origin-commit: ecf754b35792e7c798e65b4d18468cc52a78b153

Author: k8s-publishing-bot

plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go

@@ -110,10 +110,6 @@ func init() {
 	factory.RegisterPriorityFunction2("ImageLocalityPriority", priorities.ImageLocalityPriorityMap, nil, 1)
 	// Optional, cluster-autoscaler friendly priority function - give used nodes higher priority.
 	factory.RegisterPriorityFunction2("MostRequestedPriority", priorities.MostRequestedPriorityMap, nil, 1)
-	// Prioritizes nodes that satisfy pod's resource limits
-	if utilfeature.DefaultFeatureGate.Enabled(features.ResourceLimitsPriorityFunction) {
-		factory.RegisterPriorityFunction2("ResourceLimitsPriority", priorities.ResourceLimitsPriorityMap, nil, 1)
-	}
 }
 
 func defaultPredicates() sets.String {
@@ -185,7 +181,6 @@ func defaultPredicates() sets.String {
 
 // ApplyFeatureGates applies algorithm by feature gates.
 func ApplyFeatureGates() {
-
 	if utilfeature.DefaultFeatureGate.Enabled(features.TaintNodesByCondition) {
 		// Remove "CheckNodeCondition" predicate
 		factory.RemoveFitPredicate("CheckNodeCondition")
@@ -203,6 +198,11 @@ func ApplyFeatureGates() {
 
 		glog.Warningf("TaintNodesByCondition is enabled, PodToleratesNodeTaints predicate is mandatory")
 	}
+
+	// Prioritizes nodes that satisfy pod's resource limits
+	if utilfeature.DefaultFeatureGate.Enabled(features.ResourceLimitsPriorityFunction) {
+		factory.RegisterPriorityFunction2("ResourceLimitsPriority", priorities.ResourceLimitsPriorityMap, nil, 1)
+	}
 }
 
 func registerAlgorithmProvider(predSet, priSet sets.String) {