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

Cleaner yaml formatting 

Don't insert an extra blank line before separators, don't insert a
separator at the end.
This commit is contained in:
Justin Santa Barbara 2017-07-16 23:59:17 -04:00
parent bfe183c495
commit adec498834
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/assets/builder.go
View File

@ -17,11 +17,12 @@ limitations under the License.
package assets package assets
import ( import (
"bytes"
"fmt" "fmt"
"github.com/golang/glog"
"k8s.io/kops/pkg/kubemanifest"
"os" "os"
"strings" "strings"
"k8s.io/kops/pkg/kubemanifest"
) )
// AssetBuilder discovers and remaps assets // AssetBuilder discovers and remaps assets
@ -44,8 +45,8 @@ func (a *AssetBuilder) RemapManifest(data []byte) ([]byte, error) {
return nil, err return nil, err
} }
var yamlSep = []byte("\n\n---\n\n") var yamlSeparator = []byte("\n---\n\n")
var remappedManifest []byte var remappedManifests [][]byte
for _, manifest := range manifests { for _, manifest := range manifests {
err := manifest.RemapImages(a.remapImage) err := manifest.RemapImages(a.remapImage)
if err != nil { if err != nil {
@ -56,12 +57,10 @@ func (a *AssetBuilder) RemapManifest(data []byte) ([]byte, error) {
return nil, fmt.Errorf("error re-marshalling manifest: %v", err) return nil, fmt.Errorf("error re-marshalling manifest: %v", err)
} }
glog.V(10).Infof("manifest: %v", string(y)) remappedManifests = append(remappedManifests, y)
remappedManifest = append(remappedManifest, y...)
remappedManifest = append(remappedManifest, yamlSep...)
} }
return remappedManifest, nil return bytes.Join(remappedManifests, yamlSeparator), nil
} }
func (a *AssetBuilder) remapImage(image string) (string, error) { func (a *AssetBuilder) remapImage(image string) (string, error) {