Skip to content

Commit fd3c879

Browse files
authored
Merge pull request kubernetes#132443 from utam0k/clearn-nnn-bind-api
Clear pod.Status.NominatedNodeName when pod is bound
2 parents 7fbf63a + 60fa65d commit fd3c879

File tree

7 files changed

+616
-434
lines changed

7 files changed

+616
-434
lines changed

pkg/apis/core/validation/validation.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5847,6 +5847,15 @@ func ValidatePodStatusUpdate(newPod, oldPod *core.Pod, opts PodValidationOptions
58475847
}
58485848
}
58495849

5850+
// Prevent setting NominatedNodeName on already bound pods
5851+
if utilfeature.DefaultFeatureGate.Enabled(features.ClearingNominatedNodeNameAfterBinding) &&
5852+
oldPod.Spec.NodeName != "" &&
5853+
newPod.Status.NominatedNodeName != "" &&
5854+
newPod.Status.NominatedNodeName != oldPod.Status.NominatedNodeName {
5855+
allErrs = append(allErrs, field.Forbidden(fldPath.Child("nominatedNodeName"),
5856+
"may not be set on pods that are already bound to a node"))
5857+
}
5858+
58505859
if newPod.Status.ObservedGeneration < 0 {
58515860
allErrs = append(allErrs, field.Invalid(fldPath.Child("observedGeneration"), newPod.Status.ObservedGeneration, "must be a non-negative integer"))
58525861
}

0 commit comments

Comments
 (0)