Merge branch 'main' into renovate/major-major-deps

Author: cbarbian-sap

internal/helm/chart.go

@@ -125,7 +125,7 @@ func ParseChart(fsys fs.FS, chartPath string, parent *Chart) (*Chart, error) {
 	}
 
 	chart.files = Files{}
-	files, err := fileutils.Find(fsys, "", "", fileutils.FileTypeRegular|fileutils.FileTypeSymlink, 0)
+	files, err := fileutils.Find(fsys, filepath.Clean(chartPath), "", fileutils.FileTypeRegular|fileutils.FileTypeSymlink, 0)
 	if err != nil {
 		return nil, err
 	}
@@ -134,7 +134,12 @@ func ParseChart(fsys fs.FS, chartPath string, parent *Chart) (*Chart, error) {
 		if err != nil {
 			return nil, err
 		}
-		chart.files.add(file, raw)
+		name, err := filepath.Rel(chartPath, file)
+		if err != nil {
+			// TODO: is it ok to panic here in case of error ?
+			panic("this cannot happen")
+		}
+		chart.files.add(name, raw)
 	}
 
 	valuesRaw, err := fs.ReadFile(fsys, filepath.Clean(chartPath+"/values.yaml"))

internal/helm/files.go

@@ -88,6 +88,7 @@ func (f Files) AsSecrets() string {
 
 func isIgnored(name string) bool {
 	return name == "Chart.yaml" ||
+		name == "Chart.lock" ||
 		name == "LICENSE" ||
 		name == "README.md" ||
 		name == "values.yaml" ||

pkg/manifests/kustomize/generator.go

@@ -131,14 +131,12 @@ func NewKustomizeGenerator(fsys fs.FS, kustomizationPath string, _ client.Client
 		if err != nil {
 			return nil, err
 		}
-		// Note: we use relative paths as templates names to make it easier to copy the kustomization
-		// content into the ephemeral in-memory filesystem used by krusty in Generate()
 		name, err := filepath.Rel(kustomizationPath, file)
-		g.files[name] = raw
 		if err != nil {
 			// TODO: is it ok to panic here in case of error ?
 			panic("this cannot happen")
 		}
+		g.files[name] = raw
 		if filepath.Base(name) != componentConfigFilename && strings.HasSuffix(name, *options.TemplateSuffix) {
 			if t == nil {
 				t = template.New(name)
@@ -320,7 +318,7 @@ func makeFuncListFiles(files map[string][]byte) func(pattern string) ([]string,
 		if err != nil {
 			return nil, err
 		}
-		return slices.Select(maps.Keys(files), func(path string) bool { return g.Match(path) }), nil
+		return slices.Sort(slices.Select(maps.Keys(files), func(path string) bool { return g.Match(path) })), nil
 	}
 }