Merge pull request #42775 from gyliu513/kubectl-taint

Automatic merge from submit-queue (batch tested with PRs 42775, 42991, 42968, 43029) `kubectl taint` update for `NoExecute`. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: Fixes #42774 **Release note**: ```release-note ```

Merge pull request #42775 from gyliu513/kubectl-taint
c11498a3 · Kubernetes Submit Queue · GitHub · a8d8542f · ab94015e · c11498a3
Commit c11498a3 authored Mar 14, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

taint.go pkg/kubectl/cmd/taint.go +1 -1

No files found.
--- a/pkg/kubectl/cmd/taint.go
+++ b/pkg/kubectl/cmd/taint.go
@@ -61,7 +61,7 @@ var (
 		* A taint consists of a key, value, and effect. As an argument here, it is expressed as key=value:effect.
 		* The key must begin with a letter or number, and may contain letters, numbers, hyphens, dots, and underscores, up to %[1]d characters.
 		* The value must begin with a letter or number, and may contain letters, numbers, hyphens, dots, and underscores, up to %[2]d characters.
-		* The effect must be NoSchedule or PreferNoSchedule.
+		* The effect must be NoSchedule, PreferNoSchedule or NoExecute.
 		* Currently taint can only apply to node.`)

 	taint_example = templates.Examples(`