kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separate yaml output with dashes 

Fix #1088
This commit is contained in:
Justin Santa Barbara 2017-01-03 11:29:22 -05:00
parent 33979fffec
commit 332ecd7302
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/kops/get_cluster.go
View File

@ -136,7 +136,13 @@ func RunGetClusters(context Factory, out io.Writer, options *GetClusterOptions)
return t.Render(clusters, out, "NAME", "CLOUD", "SUBNETS")
case OutputYaml:
for _, cluster := range clusters {
for i, cluster := range clusters {
if i != 0 {
_, err = out.Write([]byte("\n\n---\n\n"))
if err != nil {
return fmt.Errorf("error writing to stdout: %v", err)
}
}
if err := marshalToWriter(cluster, marshalYaml, out); err != nil {
return err
}

8
cmd/kops/get_federation.go
View File

@ -86,7 +86,13 @@ func RunGetFederations(context Factory, out io.Writer, options *GetFederationOpt
return t.Render(federations, out, "NAME", "CONTROLLERS", "MEMBERS")
case OutputYaml:
for _, f := range federations {
for i, f := range federations {
if i != 0 {
_, err = out.Write([]byte("\n\n---\n\n"))
if err != nil {
return fmt.Errorf("error writing to stdout: %v", err)
}
}
if err := marshalToWriter(f, marshalYaml, os.Stdout); err != nil {
return err
}

12
cmd/kops/get_instancegroups.go
View File

@ -51,6 +51,8 @@ func init() {
}
func (c *GetInstanceGroupsCmd) Run(args []string) error {
out := os.Stdout
clusterName := rootCommand.ClusterName()
if clusterName == "" {
return fmt.Errorf("--name is required")
@ -119,8 +121,14 @@ func (c *GetInstanceGroupsCmd) Run(args []string) error {
return t.Render(instancegroups, os.Stdout, "NAME", "ROLE", "MACHINETYPE", "MIN", "MAX", "SUBNETS")
case OutputYaml:
for _, ig := range instancegroups {
if err := marshalToWriter(ig, marshalYaml, os.Stdout); err != nil {
for i, ig := range instancegroups {
if i != 0 {
_, err = out.Write([]byte("\n\n---\n\n"))
if err != nil {
return fmt.Errorf("error writing to stdout: %v", err)
}
}
if err := marshalToWriter(ig, marshalYaml, out); err != nil {
return err
}
}