Merge pull request #4908 from khrisrichardson/plugin/builtin/helmchartinflationgenerator/split

k8s-ci-robot · web-flow · commit c16957fc8fb4 · 2022-12-06T15:38:37.000-08:00
HelmChartInflationGenerator: split on yaml document end markers
diff --git a/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go b/plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go
@@ -258,7 +258,7 @@ func (p *plugin) Generate() (rm resmap.ResMap, err error) {
 	// try to remove the contents before first "---" because
 	// helm may produce messages to stdout before it
 	stdoutStr := string(stdout)
-	if idx := strings.Index(stdoutStr, "---"); idx != -1 {
+	if idx := strings.Index(stdoutStr, "\n---\n"); idx != -1 {
 		return p.h.ResmapFactory().NewResMapFromBytes([]byte(stdoutStr[idx:]))
 	}
 	return nil, err

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ func (p *plugin) Generate() (rm resmap.ResMap, err error) {`
`258`	`258`	`// try to remove the contents before first "---" because`
`259`	`259`	`// helm may produce messages to stdout before it`
`260`	`260`	`stdoutStr := string(stdout)`
`261`		`- if idx := strings.Index(stdoutStr, "---"); idx != -1 {`
	`261`	`+ if idx := strings.Index(stdoutStr, "\n---\n"); idx != -1 {`
`262`	`262`	`return p.h.ResmapFactory().NewResMapFromBytes([]byte(stdoutStr[idx:]))`
`263`	`263`	`}`
`264`	`264`	`return nil, err`