Merge pull request #57502 from tanshanshan/scheduler-NominatedNode

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Rename the annotation key for nominated pods to "scheduler.kubernetes.io/nominated-node-name" **What this PR does / why we need it**: Rename the annotation key for nominated pods to "scheduler.kubernetes.io/nominated-node-name" **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: part of #57471 **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #57502 from tanshanshan/scheduler-NominatedNode
ff23474c · Kubernetes Submit Queue · GitHub · f5f6f3e7 · 6ac0f419 · ff23474c
Unverified Commit ff23474c authored Dec 24, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

generic_scheduler.go plugin/pkg/scheduler/core/generic_scheduler.go +1 -1

No files found.
--- a/plugin/pkg/scheduler/core/generic_scheduler.go
+++ b/plugin/pkg/scheduler/core/generic_scheduler.go
@@ -64,7 +64,7 @@ const (
 	// The scheduler uses the annotation to find that the pod shouldn't preempt more pods
 	// when it gets to the head of scheduling queue again.
 	// See podEligibleToPreemptOthers() for more information.
-	NominatedNodeAnnotationKey = "NominatedNodeName"
+	NominatedNodeAnnotationKey = "scheduler.kubernetes.io/nominated-node-name"
 )

 // Error returns detailed information of why the pod failed to fit on each node