correct ordering of the k8s objects:

NameSpace, CRD, ServiceAccount, Role, ClusterRole, RoleBinding, ClusterRoleBinding
kubernetes-sigs · Jun 21, 2018 · 90d16c2 · 90d16c2
1 parent dec5109
commit 90d16c2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/pkg/resmap/idslice.go b/pkg/resmap/idslice.go
@@ -37,12 +37,27 @@ func (a IdSlice) Less(i, j int) bool {
 	return a[i].Name() < a[j].Name()
 }
 
+var typeOrders = map[string]int{
+	"Namespace":                0,
+	"CustomResourceDefinition": 1,
+	"ServiceAccount":           2,
+	"Role":                     3,
+	"ClusterRole":              4,
+	"RoleBinding":              5,
+	"ClusterRoleBinding":       6,
+}
+
 func gvkLess(i, j schema.GroupVersionKind) bool {
-	if i.Kind == "Namespace" {
+	indexi, foundi := typeOrders[i.Kind]
+	indexj, foundj := typeOrders[j.Kind]
+	if foundi && foundj {
+		return indexi < indexj
+	}
+	if foundi && !foundj {
 		return true
-	} else if j.Kind == "Namespace" {
+	}
+	if !foundi && foundj {
 		return false
-	} else {
-		return i.String() < j.String()
 	}
+	return i.String() < j.String()
 }
diff --git a/pkg/resmap/idslice_test.go b/pkg/resmap/idslice_test.go
@@ -31,10 +31,18 @@ func TestLess(t *testing.T) {
 		resource.NewResId(schema.GroupVersionKind{Kind: "Pod"}, "pod"),
 		resource.NewResId(schema.GroupVersionKind{Kind: "Namespace"}, "ns1"),
 		resource.NewResId(schema.GroupVersionKind{Kind: "Namespace"}, "ns2"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "Role"}, "ro"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "RoleBinding"}, "rb"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "CustomResourceDefinition"}, "crd"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "ServiceAccount"}, "sa"),
 	}
 	expected := IdSlice{
 		resource.NewResId(schema.GroupVersionKind{Kind: "Namespace"}, "ns1"),
 		resource.NewResId(schema.GroupVersionKind{Kind: "Namespace"}, "ns2"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "CustomResourceDefinition"}, "crd"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "ServiceAccount"}, "sa"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "Role"}, "ro"),
+		resource.NewResId(schema.GroupVersionKind{Kind: "RoleBinding"}, "rb"),
 		resource.NewResId(schema.GroupVersionKind{Kind: "ConfigMap"}, "cm"),
 		resource.NewResId(schema.GroupVersionKind{Kind: "Pod"}, "pod"),
 	}