diff --git a/api/types/kustomization.go b/api/types/kustomization.go index 41376bedd4..5c3237d5c4 100644 --- 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 index fefc810d78..61c62f29c9 100644 --- a/plugin/builtin/sortordertransformer/SortOrderTransformer.go +++ b/plugin/builtin/sortordertransformer/SortOrderTransformer.go @@ -163,6 +163,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 index 77dffafa4d..64bd3b4b1c 100644 --- 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: