Merge pull request #50877 from dixudx/taint_unimplemented_comment

Automatic merge from submit-queue newline to separate unimplemented TaintEffectNoScheduleNoAdmit **What this PR does / why we need it**: Unimplemented `TaintEffectNoScheduleNoAdmit ` should not be treated as comments of `TaintEffectNoExecute ` **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # xref #49530 **Special notes for your reviewer**: /assign @k82cn **Release note**: ```release-note None ```

Merge pull request #50877 from dixudx/taint_unimplemented_comment
e821e531 · Kubernetes Submit Queue · GitHub · 24ad0d21 · 84bf9315 · e821e531
Commit e821e531 authored Sep 09, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

types.go pkg/api/types.go +1 -0

types.go staging/src/k8s.io/api/core/v1/types.go +1 -0

No files found.
--- a/pkg/api/types.go
+++ b/pkg/api/types.go
@@ -2249,6 +2249,7 @@ const (
 	// Kubelet without going through the scheduler to start.
 	// Enforced by Kubelet and the scheduler.
 	// TaintEffectNoScheduleNoAdmit TaintEffect = "NoScheduleNoAdmit"
+
 	// Evict any already-running pods that do not tolerate the taint.
 	// Currently enforced by NodeController.
 	TaintEffectNoExecute TaintEffect = "NoExecute"

--- a/staging/src/k8s.io/api/core/v1/types.go
+++ b/staging/src/k8s.io/api/core/v1/types.go
@@ -2486,6 +2486,7 @@ const (
 	// Kubelet without going through the scheduler to start.
 	// Enforced by Kubelet and the scheduler.
 	// TaintEffectNoScheduleNoAdmit TaintEffect = "NoScheduleNoAdmit"
+
 	// Evict any already-running pods that do not tolerate the taint.
 	// Currently enforced by NodeController.
 	TaintEffectNoExecute TaintEffect = "NoExecute"