github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43882 from ymqytw/check_error

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42325, 43882)

Fix bug of not checking error

Fix bug of not checking error

```release-note
None
```
cc: @shiywang
This commit is contained in:
Kubernetes Submit Queue 2017-03-31 11:29:17 -07:00 committed by GitHub
commit 667f3ef42f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,16 +132,19 @@ func (o *ViewLastAppliedOptions) Validate(cmd *cobra.Command) error {
func (o *ViewLastAppliedOptions) RunApplyViewLastApplied() error { func (o *ViewLastAppliedOptions) RunApplyViewLastApplied() error {
for _, str := range o.LastAppliedConfigurationList { for _, str := range o.LastAppliedConfigurationList {
yamlOutput, err := yaml.JSONToYAML([]byte(str))
switch o.OutputFormat { switch o.OutputFormat {
case "json": case "json":
jsonBuffer := &bytes.Buffer{} jsonBuffer := &bytes.Buffer{}
err = json.Indent(jsonBuffer, []byte(str), "", " ") err := json.Indent(jsonBuffer, []byte(str), "", " ")
if err != nil { if err != nil {
return err return err
} }
fmt.Fprintf(o.Out, string(jsonBuffer.Bytes())) fmt.Fprintf(o.Out, string(jsonBuffer.Bytes()))
case "yaml": case "yaml":
yamlOutput, err := yaml.JSONToYAML([]byte(str))
if err != nil {
return err
}
fmt.Fprintf(o.Out, string(yamlOutput)) fmt.Fprintf(o.Out, string(yamlOutput))
} }
} }