Sort built-in Namespace kind before CRDs with the same name (#5458)

* add core api sort priority for NAmespace kind in gvkLessThan * fix logic * fix syntax * fix syntax * fix logic * regenerate builtin plugins
kubernetes-sigs · Sep 3, 2024 · b7cdd91 · b7cdd91
1 parent 27d508f
commit b7cdd91
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/api/internal/builtins/SortOrderTransformer.go b/api/internal/builtins/SortOrderTransformer.go
diff --git a/api/types/kustomization.go b/api/types/kustomization.go
@@ -22,6 +22,7 @@ const (
 	MetadataNamespacePath       = "metadata/namespace"
 	MetadataNamespaceApiVersion = "v1"
 	MetadataNamePath            = "metadata/name"
+	NamespaceKind               = "Namespace"
 
 	OriginAnnotations      = "originAnnotations"
 	TransformerAnnotations = "transformerAnnotations"

diff --git a/plugin/builtin/sortordertransformer/SortOrderTransformer.go b/plugin/builtin/sortordertransformer/SortOrderTransformer.go
@@ -154,6 +154,9 @@ func gvkLessThan(gvk1, gvk2 resid.Gvk, typeOrders map[string]int) bool {
 	if index1 != index2 {
 		return index1 < index2
 	}
+	if (gvk1.Kind == types.NamespaceKind && gvk2.Kind == types.NamespaceKind) && (gvk1.Group == "" || gvk2.Group == "") {
+		return legacyGVKSortString(gvk1) > legacyGVKSortString(gvk2)
+	}
 	return legacyGVKSortString(gvk1) < legacyGVKSortString(gvk2)
 }
 

diff --git a/plugin/builtin/sortordertransformer/SortOrderTransformer_test.go b/plugin/builtin/sortordertransformer/SortOrderTransformer_test.go
@@ -69,6 +69,12 @@ kind: Namespace
 metadata:
   name: apple
 ---
+apiVersion: servicebus.azure.com/v1api20210101preview
+kind: Namespace
+metadata:
+  name: aso-namespace
+  namespace: default
+---
 apiVersion: v1
 kind: Secret
 metadata:
@@ -108,6 +114,12 @@ kind: Namespace
 metadata:
   name: apple
 ---
+apiVersion: servicebus.azure.com/v1api20210101preview
+kind: Namespace
+metadata:
+  name: aso-namespace
+  namespace: default
+---
 apiVersion: v1
 kind: Role
 metadata:
@@ -228,6 +240,12 @@ kind: Namespace
 metadata:
   name: apple
 ---
+apiVersion: servicebus.azure.com/v1api20210101preview
+kind: Namespace
+metadata:
+  name: aso-namespace
+  namespace: default
+---
 apiVersion: v1
 kind: Deployment
 metadata:
@@ -306,6 +324,12 @@ kind: Namespace
 metadata:
   name: apple
 ---
+apiVersion: servicebus.azure.com/v1api20210101preview
+kind: Namespace
+metadata:
+  name: aso-namespace
+  namespace: default
+---
 apiVersion: v1
 kind: Deployment
 metadata: