fix(deploy): subcharts rendered incorrectly

ilya-lesikov · ilya-lesikov · commit 05e41e4143b4 · 2025-02-04T15:06:59.000+03:00
Signed-off-by: Ilya Lesikov &lt;ilya@lesikov.com&gt;
diff --git a/cmd/werf/bundle/publish/publish.go b/cmd/werf/bundle/publish/publish.go
@@ -493,7 +493,7 @@ func createNewBundle(
 	}
 
 	if destDir == "" {
-		destDir = wc.HelmChart.Metadata.Name
+		destDir = chrt.Metadata.Name
 	}
 
 	if err := os.RemoveAll(destDir); err != nil {
@@ -517,11 +517,11 @@ func createNewBundle(
 		}
 	}
 
-	if wc.HelmChart.Metadata == nil {
+	if chrt.Metadata == nil {
 		panic("unexpected condition")
 	}
 
-	bundleMetadata := *wc.HelmChart.Metadata
+	bundleMetadata := *chrt.Metadata
 	// Force api v2
 	bundleMetadata.APIVersion = chart.APIVersionV2
 	bundleMetadata.Version = chartVersion
@@ -533,9 +533,9 @@ func createNewBundle(
 		return nil, fmt.Errorf("unable to write %q: %w", chartYamlFile, err)
 	}
 
-	if wc.HelmChart.Lock != nil {
+	if chrt.Lock != nil {
 		chartLockFile := filepath.Join(destDir, "Chart.lock")
-		if data, err := json.Marshal(wc.HelmChart.Lock); err != nil {
+		if data, err := json.Marshal(chrt.Lock); err != nil {
 			return nil, fmt.Errorf("unable to prepare Chart.lock data: %w", err)
 		} else if err := ioutil.WriteFile(chartLockFile, append(data, []byte("\n")...), os.ModePerm); err != nil {
 			return nil, fmt.Errorf("unable to write %q: %w", chartLockFile, err)
@@ -547,7 +547,7 @@ func createNewBundle(
 		return nil, fmt.Errorf("unable to create dir %q: %w", templatesDir, err)
 	}
 
-	for _, f := range wc.HelmChart.Templates {
+	for _, f := range chrt.Templates {
 		if err := writeChartFile(ctx, destDir, f.Name, f.Data); err != nil {
 			return nil, fmt.Errorf("error writing chart template: %w", err)
 		}
@@ -568,7 +568,7 @@ func createNewBundle(
 	}
 
 WritingFiles:
-	for _, f := range wc.HelmChart.Files {
+	for _, f := range chrt.Files {
 		for _, ignoreValuesFile := range ignoreChartValuesFiles {
 			if f.Name == ignoreValuesFile {
 				continue WritingFiles
@@ -580,7 +580,7 @@ WritingFiles:
 		}
 	}
 
-	for _, dep := range wc.HelmChart.Metadata.Dependencies {
+	for _, dep := range chrt.Metadata.Dependencies {
 		var depPath string
 
 		switch {
@@ -592,7 +592,7 @@ WritingFiles:
 			depPath = fmt.Sprintf("charts/%s-%s.tgz", dep.Name, dep.Version)
 		}
 
-		for _, f := range wc.HelmChart.Raw {
+		for _, f := range chrt.Raw {
 			if strings.HasPrefix(f.Name, depPath) {
 				if err := writeChartFile(ctx, destDir, f.Name, f.Data); err != nil {
 					return nil, fmt.Errorf("error writing subchart file: %w", err)
@@ -601,12 +601,12 @@ WritingFiles:
 		}
 	}
 
-	if wc.HelmChart.Schema != nil {
+	if chrt.Schema != nil {
 		schemaFile := filepath.Join(destDir, "values.schema.json")
-		if err := writeChartFile(ctx, destDir, "values.schema.json", wc.HelmChart.Schema); err != nil {
+		if err := writeChartFile(ctx, destDir, "values.schema.json", chrt.Schema); err != nil {
 			return nil, fmt.Errorf("error writing chart values schema: %w", err)
 		}
-		if err := ioutil.WriteFile(schemaFile, wc.HelmChart.Schema, os.ModePerm); err != nil {
+		if err := ioutil.WriteFile(schemaFile, chrt.Schema, os.ModePerm); err != nil {
 			return nil, fmt.Errorf("unable to write %q: %w", schemaFile, err)
 		}
 	}
diff --git a/go.mod b/go.mod
@@ -60,7 +60,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	github.com/werf/3p-helm v0.0.0-20250204105623-50b0062dce93
+	github.com/werf/3p-helm v0.0.0-20250204120453-e5dd1167f834
 	github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d
 	github.com/werf/common-go v0.0.0-20250115100423-863829c6587b
 	github.com/werf/copy-recurse v0.2.7
diff --git a/go.sum b/go.sum
@@ -1433,8 +1433,8 @@ github.com/werf/3p-buildah v1.35.2-0.20241120093816-5b80b7b735de h1:adTANOZyNmmn
 github.com/werf/3p-buildah v1.35.2-0.20241120093816-5b80b7b735de/go.mod h1:vVSVUlTu8+99H5j43gBJscpkb/quZvdJg78+6X1HeTM=
 github.com/werf/3p-docker-buildx v0.13.0-rc2.0.20241111114615-d77c2e1444ad h1:FBDNACfjjpDBwXhALF5LgvEiu08HpUurb/2G323SVsQ=
 github.com/werf/3p-docker-buildx v0.13.0-rc2.0.20241111114615-d77c2e1444ad/go.mod h1:Q3gtkv8D3sdaa5LJXbzMooYR/A5vBiEB2yQ56wywohM=
-github.com/werf/3p-helm v0.0.0-20250204105623-50b0062dce93 h1:HKcFfuYjLxaLob8x8Jl3+ocXBVUb5bDP6/UvmOKlU6E=
-github.com/werf/3p-helm v0.0.0-20250204105623-50b0062dce93/go.mod h1:LoLuFhwWr1El/R/tqwUn2ZmRZdThnSlUmkdDPDE+udk=
+github.com/werf/3p-helm v0.0.0-20250204120453-e5dd1167f834 h1:uZdBQJ1TtBdZ5h4Sd3XCH1ZmMnt/g/0strNCzwafwBU=
+github.com/werf/3p-helm v0.0.0-20250204120453-e5dd1167f834/go.mod h1:LoLuFhwWr1El/R/tqwUn2ZmRZdThnSlUmkdDPDE+udk=
 github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d h1:HN9jmAG2Gyhf8hJca9yoAO2xawNZQ/6OYDomxkKr5Sw=
 github.com/werf/3p-helm-for-werf-helm v0.0.0-20241217155820-089f92cd5c9d/go.mod h1:fozJ+C/Llp1e+jHxrJOZUu+D4QEw+laQK6W6RFqvTsg=
 github.com/werf/3p-oras v0.9.1-0.20240115121544-03962ecbd40a h1:PsU9szHZlIH+CjcuIuPXRLc5dsdoaFldvYjS6YHI7YQ=
diff --git a/pkg/deploy/helm/chart_extender/bundle.go b/pkg/deploy/helm/chart_extender/bundle.go
@@ -39,17 +39,12 @@ func NewBundle(
 type Bundle struct {
 	Dir                        string
 	SecretValueFiles           []string
-	HelmChart                  *chart.Chart
 	BuildChartDependenciesOpts chart.BuildChartDependenciesOptions
 	DisableDefaultValues       bool
 
 	*helpers.ChartExtenderServiceValuesData
 }
 
-func (bundle *Bundle) SetHelmChart(c *chart.Chart) {
-	bundle.HelmChart = c
-}
-
 func (bundle *Bundle) Type() string {
 	return "bundle"
 }
diff --git a/pkg/deploy/helm/chart_extender/werf_chart.go b/pkg/deploy/helm/chart_extender/werf_chart.go
@@ -40,8 +40,6 @@ func NewWerfChart(
 }
 
 type WerfChart struct {
-	HelmChart *chart.Chart
-
 	ChartDir                   string
 	ProjectDir                 string
 	SecretValueFiles           []string
@@ -53,11 +51,6 @@ type WerfChart struct {
 	*helpers.ChartExtenderServiceValuesData
 }
 
-// SetHelmChart method for the chart.Extender interface
-func (wc *WerfChart) SetHelmChart(c *chart.Chart) {
-	wc.HelmChart = c
-}
-
 func (wc *WerfChart) Type() string {
 	return "chart"
 }

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ func createNewBundle(`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`if destDir == "" {`
`496`		`- destDir = wc.HelmChart.Metadata.Name`
	`496`	`+ destDir = chrt.Metadata.Name`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`if err := os.RemoveAll(destDir); err != nil {`
`@@ -517,11 +517,11 @@ func createNewBundle(`
`517`	`517`	`}`
`518`	`518`	`}`
`519`	`519`
`520`		`- if wc.HelmChart.Metadata == nil {`
	`520`	`+ if chrt.Metadata == nil {`
`521`	`521`	`panic("unexpected condition")`
`522`	`522`	`}`
`523`	`523`
`524`		`- bundleMetadata := *wc.HelmChart.Metadata`
	`524`	`+ bundleMetadata := *chrt.Metadata`
`525`	`525`	`// Force api v2`
`526`	`526`	`bundleMetadata.APIVersion = chart.APIVersionV2`
`527`	`527`	`bundleMetadata.Version = chartVersion`
`@@ -533,9 +533,9 @@ func createNewBundle(`
`533`	`533`	`return nil, fmt.Errorf("unable to write %q: %w", chartYamlFile, err)`
`534`	`534`	`}`
`535`	`535`
`536`		`- if wc.HelmChart.Lock != nil {`
	`536`	`+ if chrt.Lock != nil {`
`537`	`537`	`chartLockFile := filepath.Join(destDir, "Chart.lock")`
`538`		`- if data, err := json.Marshal(wc.HelmChart.Lock); err != nil {`
	`538`	`+ if data, err := json.Marshal(chrt.Lock); err != nil {`
`539`	`539`	`return nil, fmt.Errorf("unable to prepare Chart.lock data: %w", err)`
`540`	`540`	`} else if err := ioutil.WriteFile(chartLockFile, append(data, []byte("\n")...), os.ModePerm); err != nil {`
`541`	`541`	`return nil, fmt.Errorf("unable to write %q: %w", chartLockFile, err)`
`@@ -547,7 +547,7 @@ func createNewBundle(`
`547`	`547`	`return nil, fmt.Errorf("unable to create dir %q: %w", templatesDir, err)`
`548`	`548`	`}`
`549`	`549`
`550`		`- for _, f := range wc.HelmChart.Templates {`
	`550`	`+ for _, f := range chrt.Templates {`
`551`	`551`	`if err := writeChartFile(ctx, destDir, f.Name, f.Data); err != nil {`
`552`	`552`	`return nil, fmt.Errorf("error writing chart template: %w", err)`
`553`	`553`	`}`
`@@ -568,7 +568,7 @@ func createNewBundle(`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`WritingFiles:`
`571`		`- for _, f := range wc.HelmChart.Files {`
	`571`	`+ for _, f := range chrt.Files {`
`572`	`572`	`for _, ignoreValuesFile := range ignoreChartValuesFiles {`
`573`	`573`	`if f.Name == ignoreValuesFile {`
`574`	`574`	`continue WritingFiles`
`@@ -580,7 +580,7 @@ WritingFiles:`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`
`583`		`- for _, dep := range wc.HelmChart.Metadata.Dependencies {`
	`583`	`+ for _, dep := range chrt.Metadata.Dependencies {`
`584`	`584`	`var depPath string`
`585`	`585`
`586`	`586`	`switch {`
`@@ -592,7 +592,7 @@ WritingFiles:`
`592`	`592`	`depPath = fmt.Sprintf("charts/%s-%s.tgz", dep.Name, dep.Version)`
`593`	`593`	`}`
`594`	`594`
`595`		`- for _, f := range wc.HelmChart.Raw {`
	`595`	`+ for _, f := range chrt.Raw {`
`596`	`596`	`if strings.HasPrefix(f.Name, depPath) {`
`597`	`597`	`if err := writeChartFile(ctx, destDir, f.Name, f.Data); err != nil {`
`598`	`598`	`return nil, fmt.Errorf("error writing subchart file: %w", err)`
`@@ -601,12 +601,12 @@ WritingFiles:`
`601`	`601`	`}`
`602`	`602`	`}`
`603`	`603`
`604`		`- if wc.HelmChart.Schema != nil {`
	`604`	`+ if chrt.Schema != nil {`
`605`	`605`	`schemaFile := filepath.Join(destDir, "values.schema.json")`
`606`		`- if err := writeChartFile(ctx, destDir, "values.schema.json", wc.HelmChart.Schema); err != nil {`
	`606`	`+ if err := writeChartFile(ctx, destDir, "values.schema.json", chrt.Schema); err != nil {`
`607`	`607`	`return nil, fmt.Errorf("error writing chart values schema: %w", err)`
`608`	`608`	`}`
`609`		`- if err := ioutil.WriteFile(schemaFile, wc.HelmChart.Schema, os.ModePerm); err != nil {`
	`609`	`+ if err := ioutil.WriteFile(schemaFile, chrt.Schema, os.ModePerm); err != nil {`
`610`	`610`	`return nil, fmt.Errorf("unable to write %q: %w", schemaFile, err)`
`611`	`611`	`}`
`612`	`612`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ func NewWerfChart(`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`type WerfChart struct {`
`43`		`- HelmChart *chart.Chart`
`44`		`-`
`45`	`43`	`ChartDir string`
`46`	`44`	`ProjectDir string`
`47`	`45`	`SecretValueFiles []string`
`@@ -53,11 +51,6 @@ type WerfChart struct {`
`53`	`51`	`*helpers.ChartExtenderServiceValuesData`
`54`	`52`	`}`
`55`	`53`
`56`		`-// SetHelmChart method for the chart.Extender interface`
`57`		`-func (wc WerfChart) SetHelmChart(c chart.Chart) {`
`58`		`- wc.HelmChart = c`
`59`		`-}`
`60`		`-`
`61`	`54`	`func (wc *WerfChart) Type() string {`
`62`	`55`	`return "chart"`
`63`	`56`	`}`