From 74228eb3aba77b538c78e87ee7c6139359ade74f Mon Sep 17 00:00:00 2001 From: Cristian Klein Date: Fri, 29 Nov 2019 22:36:27 +0100 Subject: [PATCH] feat(template): Ensure entries have a stable order Signed-off-by: Cristian Klein --- pkg/releaseutil/kind_sorter.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/releaseutil/kind_sorter.go b/pkg/releaseutil/kind_sorter.go index 92ffa03f2..f90d57c46 100644 --- a/pkg/releaseutil/kind_sorter.go +++ b/pkg/releaseutil/kind_sorter.go @@ -140,7 +140,11 @@ func (k *kindSorter) Less(i, j int) bool { if a.Head.Kind != b.Head.Kind { return a.Head.Kind < b.Head.Kind } - return first < second + if a.Name != b.Name { + return a.Name < b.Name + } + // if same kind in same file, then sort by name to ensure a stable order + return a.Head.Metadata.Name < b.Head.Metadata.Name } // unknown kind is last if !aok {