Skip to content

make listFiles result alphabetically sorted #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbarbian-sap merged 1 commit into from
May 1, 2025
Merged

make listFiles result alphabetically sorted #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkg/manifests/kustomize/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
}
}

Expand Down