fix: Use generateName as last comparison when sorting (#1031)

Author: zerok

pkg/kubernetes/manifest/manifest.go

@@ -203,6 +203,14 @@ func (m Metadata) Name() string {
 	return name.(string)
 }
 
+func (m Metadata) GenerateName() string {
+	generateName, ok := m["generateName"]
+	if !ok {
+		return ""
+	}
+	return generateName.(string)
+}
+
 // HasNamespace returns whether the manifest has a namespace set
 func (m Metadata) HasNamespace() bool {
 	return m2o(m).Get("namespace").IsStr()

pkg/process/sort.go

@@ -82,7 +82,10 @@ func Sort(list manifest.List) {
 			return list[i].Metadata().Namespace() < list[j].Metadata().Namespace()
 		}
 
-		// Otherwise, order the objects by name.
-		return list[i].Metadata().Name() < list[j].Metadata().Name()
+		if list[i].Metadata().Name() != list[j].Metadata().Name() {
+			return list[i].Metadata().Name() < list[j].Metadata().Name()
+		}
+
+		return list[i].Metadata().GenerateName() < list[j].Metadata().GenerateName()
 	})
 }

pkg/process/sort_test.go

@@ -78,6 +78,19 @@ func TestSort(t *testing.T) {
 				mkobj("CustomResourceDefinition", "crd2", ""),
 			},
 		},
+		{
+			// sorting by the generate name prefix if everything else is the same
+			raw: manifest.List{
+				mkGenerateObj("CustomResourceDefinition", "crd2-", ""),
+				mkGenerateObj("CustomResourceDefinition", "crd-", ""),
+				mkGenerateObj("CustomResourceDefinition", "crd1-", ""),
+			},
+			state: manifest.List{
+				mkGenerateObj("CustomResourceDefinition", "crd-", ""),
+				mkGenerateObj("CustomResourceDefinition", "crd1-", ""),
+				mkGenerateObj("CustomResourceDefinition", "crd2-", ""),
+			},
+		},
 		{
 			raw: manifest.List{
 				mkobj("Deployment", "b", "a"),
@@ -130,3 +143,9 @@ func mkobj(kind string, name string, ns string) map[string]interface{} {
 
 	return ret
 }
+
+func mkGenerateObj(kind string, generateName string, ns string) map[string]interface{} {
+	result := mkobj(kind, "", ns)
+	result["metadata"].(map[string]interface{})["generateName"] = generateName
+	return result
+}