From 49072c810a3725a7419e45d81d4503c775ecbdcb Mon Sep 17 00:00:00 2001
From: Kevin <wangzefeng@huawei.com>
Date: Mon, 27 Feb 2017 21:28:45 +0800
Subject: [PATCH] fix kubectl describe pod, show tolerationSeconds

---
 pkg/printers/internalversion/describe.go      | 3 +++
 pkg/printers/internalversion/describe_test.go | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go
index f00b9f1add2..cdc4b8f3968 100644
--- a/pkg/printers/internalversion/describe.go
+++ b/pkg/printers/internalversion/describe.go
@@ -2893,6 +2893,9 @@ func printTolerationsMultilineWithIndent(w *PrefixWriter, initialIndent, title,
 				if len(toleration.Effect) != 0 {
 					w.Write(LEVEL_0, ":%s", toleration.Effect)
 				}
+				if toleration.TolerationSeconds != nil {
+					w.Write(LEVEL_0, " for %ds", *toleration.TolerationSeconds)
+				}
 				w.Write(LEVEL_0, "\n")
 				i++
 			}
diff --git a/pkg/printers/internalversion/describe_test.go b/pkg/printers/internalversion/describe_test.go
index 218ad7a9351..422d5639f50 100644
--- a/pkg/printers/internalversion/describe_test.go
+++ b/pkg/printers/internalversion/describe_test.go
@@ -78,7 +78,7 @@ func TestDescribePodTolerations(t *testing.T) {
 		Spec: api.PodSpec{
 			Tolerations: []api.Toleration{
 				{Key: "key1", Value: "value1"},
-				{Key: "key2", Value: "value2"},
+				{Key: "key2", Value: "value2", Effect: api.TaintEffectNoExecute, TolerationSeconds: &[]int64{300}[0]},
 			},
 		},
 	})
@@ -88,7 +88,7 @@ func TestDescribePodTolerations(t *testing.T) {
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
-	if !strings.Contains(out, "key1=value1") || !strings.Contains(out, "key2=value2") || !strings.Contains(out, "Tolerations:") {
+	if !strings.Contains(out, "key1=value1") || !strings.Contains(out, "key2=value2:NoExecute for 300s") || !strings.Contains(out, "Tolerations:") {
 		t.Errorf("unexpected out: %s", out)
 	}
 }