Merge pull request #63769 from liggitt/kubectl-taint-internal-object

Automatic merge from submit-queue (batch tested with PRs 55511, 63372, 63400, 63100, 63769). 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>. print result object from kubectl taint correctly fixes #63767 ```release-note NONE ```

Merge pull request #63769 from liggitt/kubectl-taint-internal-object
141e4ee0 · Kubernetes Submit Queue · GitHub · a1b54f3c · 746bca24 · 141e4ee0
Unverified Commit 141e4ee0 authored May 14, 2018 by Kubernetes Submit Queue Committed by GitHub May 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

test-cmd-util.sh hack/make-rules/test-cmd-util.sh +11 -0

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

No files found.
--- a/hack/make-rules/test-cmd-util.sh
+++ b/hack/make-rules/test-cmd-util.sh
@@ -4617,6 +4617,17 @@ __EOF__
 }
 __EOF__

+  # taint/untaint
+  # Pre-condition: node has no taints
+  kube::test::get_object_assert "nodes 127.0.0.1" "{{.spec.taints}}" '<no value>'
+  # taint can add a taint
+  kubectl taint node 127.0.0.1 dedicated=foo:PreferNoSchedule
+  kube::test::get_object_assert "nodes 127.0.0.1" '{{range .spec.taints}}{{.effect}}{{end}}' 'PreferNoSchedule'
+  # taint can remove a taint
+  kubectl taint node 127.0.0.1 dedicated-
+  # Post-condition: node has no taints
+  kube::test::get_object_assert "nodes 127.0.0.1" "{{.spec.taints}}" '<no value>'
+
  ### kubectl cordon update with --dry-run does not mark node unschedulable
  # Pre-condition: node is schedulable
  kube::test::get_object_assert "nodes 127.0.0.1" "{{.spec.unschedulable}}" '<no value>'

--- a/pkg/kubectl/cmd/taint.go
+++ b/pkg/kubectl/cmd/taint.go
@@ -290,6 +290,7 @@ func (o TaintOptions) RunTaint() error {
 		if err != nil {
 			return err
 		}
+		outputObj = cmdutil.AsDefaultVersionedOrOriginal(outputObj, mapping)

 		printer, err := o.ToPrinter(operation)
 		if err != nil {