left-pad helm chart filenames with 0s to fix sorting

Signed-off-by: Andrew Lavery <[email protected]>
k0sproject · Feb 21, 2024 · 23fd02e · 23fd02e
1 parent 76e3ce7
commit 23fd02e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pkg/apis/k0s/v1beta1/extensions.go b/pkg/apis/k0s/v1beta1/extensions.go
@@ -102,7 +102,7 @@ type Chart struct {
 
 // ManifestFileName returns filename to use for the crd manifest
 func (c Chart) ManifestFileName() string {
-	return fmt.Sprintf("%d_helm_extension_%s.yaml", c.Order, c.Name)
+	return fmt.Sprintf("%9d_helm_extension_%s.yaml", c.Order, c.Name)
 }
 
 // Validate performs validation

diff --git a/pkg/apis/k0s/v1beta1/extenstions_test.go b/pkg/apis/k0s/v1beta1/extenstions_test.go
@@ -102,9 +102,17 @@ func TestValidation(t *testing.T) {
 			TargetNS:  "default",
 			Order:     2,
 		}
-		assert.Equal(t, chart.ManifestFileName(), "0_helm_extension_release.yaml")
-		assert.Equal(t, chart1.ManifestFileName(), "1_helm_extension_release.yaml")
-		assert.Equal(t, chart2.ManifestFileName(), "2_helm_extension_release.yaml")
+
+		chart20 := Chart{
+			Name:      "release",
+			ChartName: "k0s/chart",
+			TargetNS:  "default",
+			Order:     20,
+		}
+		assert.Equal(t, chart.ManifestFileName(), "000000000_helm_extension_release.yaml")
+		assert.Equal(t, chart1.ManifestFileName(), "000000001_helm_extension_release.yaml")
+		assert.Equal(t, chart2.ManifestFileName(), "000000002_helm_extension_release.yaml")
+		assert.Equal(t, chart20.ManifestFileName(), "000000020_helm_extension_release.yaml")
 	})
 
 }