fix(helm): fix comments and removed unwanted split

pull/2190/head
Anubhav Mishra 8 years ago committed by GitHub
parent 837da9360e
commit 1cf197d69e

@ -32,19 +32,19 @@ type SimpleHead struct {
} `json:"metadata,omitempty"` } `json:"metadata,omitempty"`
} }
var sep = regexp.MustCompile("(?:^|\\s*\n)---\\s*")
// SplitManifests takes a string of manifest and returns a map contains individual manifests // SplitManifests takes a string of manifest and returns a map contains individual manifests
func SplitManifests(bigfile string) map[string]string { func SplitManifests(bigfile string) map[string]string {
// This is not the best way of doing things, but it's how k8s itself does it. // This is not the best way of doing things, but it's how k8s itself does it.
// Basically, we're quickly splitting a stream of YAML documents into an // Basically, we're quickly splitting a stream of YAML documents into an
// array of YAML docs. In the current implementation, the file name is just // array of YAML docs. In the current implementation, the file name is just
// a place holder, and doesn't have any further meaning. // a place holder, and doesn't have any further meaning.
sep := regexp.MustCompile("(?:^|\\s*\n)---\\s*")
tpl := "manifest-%d" tpl := "manifest-%d"
res := map[string]string{} res := map[string]string{}
// Making sure YAML formatting doesn't matter when generating manifest from string. // Making sure that any extra whitespace in YAML stream doesn't interfere in splitting documents correctly.
bigFileTmp := strings.TrimSpace(bigfile) docs := sep.Split(bigfile, -1)
tmp := sep.Split(bigFileTmp, -1) for i, d := range docs {
for i, d := range tmp {
res[fmt.Sprintf(tpl, i)] = d res[fmt.Sprintf(tpl, i)] = d
} }
return res return res

Loading…
Cancel
Save