github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31685 from jellonek/jell/29524

Browse Source 
Automatic merge from submit-queue

kubectl edit: Do not add warning header if ftype is json.

This PR blocks adding warning header if `kubectl edit` is used with `-o json` option.
Fixed header contains comment (what is not supported by json standard) what can break utilities which are using libraries that conforms with http://www.ietf.org/rfc/rfc7159.txt

fixes #29524

/cc @pwittrock 

```release-note
Removed comments in json config when using kubectl edit with -o json
```
This commit is contained in:
Kubernetes Submit Queue 2016-09-05 19:35:31 -07:00 committed by GitHub
commit 8d00825481
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubectl/cmd/edit.go
View File

@ -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 { func RunEdit(f *cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args []string, options *EditOptions) error {
var printer kubectl.ResourcePrinter var printer kubectl.ResourcePrinter
var ext string var ext string
var addHeader bool
switch format := cmdutil.GetFlagString(cmd, "output"); format { switch format := cmdutil.GetFlagString(cmd, "output"); format {
case "json": case "json":
printer = &kubectl.JSONPrinter{} printer = &kubectl.JSONPrinter{}
ext = ".json" ext = ".json"
addHeader = false
case "yaml": case "yaml":
printer = &kubectl.YAMLPrinter{} printer = &kubectl.YAMLPrinter{}
ext = ".yaml" ext = ".yaml"
addHeader = true
default: default:
return cmdutil.UsageError(cmd, "The flag 'output' must be one of yaml|json") 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) w = crlf.NewCRLFWriter(w)
} }
results.header.writeTo(w) if addHeader {
results.header.writeTo(w)
}
if !containsError { if !containsError {
if err := printer.PrintObj(objToEdit, w); err != nil { if err := printer.PrintObj(objToEdit, w); err != nil {