kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-09-15 12:18:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

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

Browse Source 
* add core api sort priority for NAmespace kind in gvkLessThan

* fix logic

* fix syntax

* fix syntax

* fix logic

* regenerate builtin plugins
This commit is contained in:
Daniel Wilson
2024-09-03 21:57:17 +01:00
committed by GitHub
parent 27d508fa03
commit b7cdd9168a
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/internal/builtins/SortOrderTransformer.go
View File

@@ -151,6 +151,9 @@ func gvkLessThan(gvk1, gvk2 resid.Gvk, typeOrders map[string]int) bool {
if index1 != index2 { if index1 != index2 {
return 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) return legacyGVKSortString(gvk1) < legacyGVKSortString(gvk2)
} }

1
api/types/kustomization.go
View File

@@ -22,6 +22,7 @@ const (
MetadataNamespacePath = "metadata/namespace" MetadataNamespacePath = "metadata/namespace"
MetadataNamespaceApiVersion = "v1" MetadataNamespaceApiVersion = "v1"
MetadataNamePath = "metadata/name" MetadataNamePath = "metadata/name"
NamespaceKind = "Namespace"
OriginAnnotations = "originAnnotations" OriginAnnotations = "originAnnotations"
TransformerAnnotations = "transformerAnnotations" TransformerAnnotations = "transformerAnnotations"

3
plugin/builtin/sortordertransformer/SortOrderTransformer.go
View File

@@ -154,6 +154,9 @@ func gvkLessThan(gvk1, gvk2 resid.Gvk, typeOrders map[string]int) bool {
if index1 != index2 { if index1 != index2 {
return 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) return legacyGVKSortString(gvk1) < legacyGVKSortString(gvk2)
} }

24
plugin/builtin/sortordertransformer/SortOrderTransformer_test.go
View File

@@ -69,6 +69,12 @@ kind: Namespace
metadata: metadata:
name: apple name: apple
--- ---
apiVersion: servicebus.azure.com/v1api20210101preview
kind: Namespace
metadata:
name: aso-namespace
namespace: default
---
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
@@ -108,6 +114,12 @@ kind: Namespace
metadata: metadata:
name: apple name: apple
--- ---
apiVersion: servicebus.azure.com/v1api20210101preview
kind: Namespace
metadata:
name: aso-namespace
namespace: default
---
apiVersion: v1 apiVersion: v1
kind: Role kind: Role
metadata: metadata:
@@ -228,6 +240,12 @@ kind: Namespace
metadata: metadata:
name: apple name: apple
--- ---
apiVersion: servicebus.azure.com/v1api20210101preview
kind: Namespace
metadata:
name: aso-namespace
namespace: default
---
apiVersion: v1 apiVersion: v1
kind: Deployment kind: Deployment
metadata: metadata:
@@ -306,6 +324,12 @@ kind: Namespace
metadata: metadata:
name: apple name: apple
--- ---
apiVersion: servicebus.azure.com/v1api20210101preview
kind: Namespace
metadata:
name: aso-namespace
namespace: default
---
apiVersion: v1 apiVersion: v1
kind: Deployment kind: Deployment
metadata: metadata: