diff --git a/Makefile-plugins.mk b/Makefile-plugins.mk index b4f207434..6cc49b388 100644 --- a/Makefile-plugins.mk +++ b/Makefile-plugins.mk @@ -79,7 +79,7 @@ $(pGen)/HelmChartInflationGenerator.go: $(pSrc)/helmchartinflationgenerator/Helm # The (verbose but portable) Makefile way to convert to lowercase. toLowerCase = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1)))))))))))))))))))))))))) -$(pGen)/%.go: $(MYGOBIN)/pluginator +$(pGen)/%.go: $(MYGOBIN)/pluginator $(MYGOBIN)/goimports @echo "generating $*" ( \ set -e; \ diff --git a/api/internal/builtins/HelmChartInflationGenerator.go b/api/internal/builtins/HelmChartInflationGenerator.go index fd986da41..8798b9e14 100644 --- a/api/internal/builtins/HelmChartInflationGenerator.go +++ b/api/internal/builtins/HelmChartInflationGenerator.go @@ -252,7 +252,7 @@ func (p *HelmChartInflationGeneratorPlugin) Generate() (rm resmap.ResMap, err er // 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