Merge pull request #49134 from deads2k/cli-14-tolerate-missing-template

Automatic merge from submit-queue (batch tested with PRs 49055, 49128, 49132, 49134, 49110) make sure that the template param is the right type before using it The CLI should attempt to make sure that the flags it uses conform to expectations instead of unconditionally killing a process. This allows for possible re-use of the printing stack.

Merge pull request #49134 from deads2k/cli-14-tolerate-missing-template
882f838a · Kubernetes Submit Queue · GitHub · 8337bd02 · a67255c1 · 882f838a
Commit 882f838a authored Jul 18, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

printing.go pkg/kubectl/cmd/util/printing.go +4 -2

No files found.
--- a/pkg/kubectl/cmd/util/printing.go
+++ b/pkg/kubectl/cmd/util/printing.go
@@ -160,8 +160,10 @@ func extractOutputOptions(cmd *cobra.Command) *printers.OutputOptions {
 	// templates are logically optional for specifying a format.
 	// TODO once https://github.com/kubernetes/kubernetes/issues/12668 is fixed, this should fall back to GetFlagString
 	var templateFile string
-	if flags.Lookup("template") != nil {
-		templateFile = GetFlagString(cmd, "template")
+	if flag := flags.Lookup("template"); flag != nil {
+		if flag.Value.Type() == "string" {
+			templateFile = GetFlagString(cmd, "template")
+		}
 	}
 	if len(outputFormat) == 0 && len(templateFile) != 0 {
 		outputFormat = "template"