fix: append additional files correctly for sub charts (#2216)

replicatedhq · Sep 25, 2021 · e20e23c · e20e23c
1 parent 7156a60
commit e20e23c
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/pkg/base/helm.go b/pkg/base/helm.go
@@ -235,13 +235,26 @@ func removeCommonPrefix(baseFiles []BaseFile) []BaseFile {
 
 func helmChartBaseAppendAdditionalFiles(base Base, u *upstreamtypes.Upstream) Base {
 	for _, upstreamFile := range u.Files {
-		if upstreamFile.Path == path.Join(base.Path, "Chart.yaml") {
+		// need to check if base path is an empty string here to catch just the top level additional files
+		// otherwise, we need to check if the upstream path contains the base path to correctly add files for sub-charts
+		if base.Path == "" && upstreamFile.Path == path.Join(base.Path, "Chart.yaml") {
+			base.AdditionalFiles = append(base.AdditionalFiles, BaseFile{
+				Path:    "Chart.yaml",
+				Content: upstreamFile.Content,
+			})
+		} else if base.Path != "" && strings.Contains(upstreamFile.Path, path.Join(base.Path, "Chart.yaml")) {
 			base.AdditionalFiles = append(base.AdditionalFiles, BaseFile{
 				Path:    "Chart.yaml",
 				Content: upstreamFile.Content,
 			})
 		}
-		if upstreamFile.Path == path.Join(base.Path, "Chart.lock") {
+
+		if base.Path == "" && upstreamFile.Path == path.Join(base.Path, "Chart.lock") {
+			base.AdditionalFiles = append(base.AdditionalFiles, BaseFile{
+				Path:    "Chart.lock",
+				Content: upstreamFile.Content,
+			})
+		} else if base.Path != "" && strings.Contains(upstreamFile.Path, path.Join(base.Path, "Chart.lock")) {
 			base.AdditionalFiles = append(base.AdditionalFiles, BaseFile{
 				Path:    "Chart.lock",
 				Content: upstreamFile.Content,