From d0e59e0c2261c0ef807e80469e4c17c2af72f678 Mon Sep 17 00:00:00 2001
From: Piotr Skamruk <piotr.skamruk@gmail.com>
Date: Tue, 30 Aug 2016 10:15:45 +0200
Subject: [PATCH] kubectl: Do not add warning header if ftype is json.

---
 pkg/kubectl/cmd/edit.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkg/kubectl/cmd/edit.go b/pkg/kubectl/cmd/edit.go
index cf35a499c9a..ae760b39619 100644
--- a/pkg/kubectl/cmd/edit.go
+++ b/pkg/kubectl/cmd/edit.go
@@ -133,13 +133,16 @@ func NewCmdEdit(f *cmdutil.Factory, out, errOut io.Writer) *cobra.Command {
 func RunEdit(f *cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args []string, options *EditOptions) error {
 	var printer kubectl.ResourcePrinter
 	var ext string
+	var addHeader bool
 	switch format := cmdutil.GetFlagString(cmd, "output"); format {
 	case "json":
 		printer = &kubectl.JSONPrinter{}
 		ext = ".json"
+		addHeader = false
 	case "yaml":
 		printer = &kubectl.YAMLPrinter{}
 		ext = ".yaml"
+		addHeader = true
 	default:
 		return cmdutil.UsageError(cmd, "The flag 'output' must be one of yaml|json")
 	}
@@ -218,7 +221,9 @@ func RunEdit(f *cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args
 				w = crlf.NewCRLFWriter(w)
 			}
 
-			results.header.writeTo(w)
+			if addHeader {
+				results.header.writeTo(w)
+			}
 
 			if !containsError {
 				if err := printer.PrintObj(objToEdit, w); err != nil {