Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Sep 3, 2024
+31 −0
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad5ca54
add core api sort priority for NAmespace kind in gvkLessThan
danielwilsonkainos Nov 15, 2023
cc96884
fix logic
danielwilsonkainos Nov 15, 2023
a0985b1
fix syntax
danielwilsonkainos Nov 15, 2023
149aad5
fix syntax
danielwilsonkainos Nov 15, 2023
2beab4c
fix logic
danielwilsonkainos Nov 15, 2023
ad620e8
Merge branch 'kubernetes-sigs:master' into sortorder
danielwilsonkainos Aug 7, 2024
cf07bd9
regenerate builtin plugins
danielwilsonkainos Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions api/internal/builtins/SortOrderTransformer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/types/kustomization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const (
MetadataNamespacePath = "metadata/namespace"
MetadataNamespaceApiVersion = "v1"
MetadataNamePath = "metadata/name"
NamespaceKind = "Namespace"

OriginAnnotations = "originAnnotations"
TransformerAnnotations = "transformerAnnotations"
Expand Down
3 changes: 3 additions & 0 deletions plugin/builtin/sortordertransformer/SortOrderTransformer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
24 changes: 24 additions & 0 deletions plugin/builtin/sortordertransformer/SortOrderTransformer_test.go
View file
Open in desktop
Copy link
Member

@stormqueen1990 stormqueen1990 Mar 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the group name in these tests significant? If not, could we use something more generic (such as group.example.org/v1)?

Same for the namespace name (most resources use fruit names, it would be nice to keep that consistent).

Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading