Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-19 23:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3550 from fluxcd/fix-tree-crds

Browse Source 
flux tree: Set CRDs GroupKind in output
This commit is contained in:
Stefan Prodan
2023-02-01 12:57:25 +02:00
committed by GitHub
parent 0361a08aa0 87232fd4dd
commit 176444263c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/flux/tree_kustomization.go
View File

@@ -298,12 +298,13 @@ func getHelmReleaseInventory(ctx context.Context, objectKey client.ObjectKey, ku
fmt.Sprintf("%s/name", helmv2.GroupVersion.Group): hr.GetName(),
fmt.Sprintf("%s/namespace", helmv2.GroupVersion.Group): hr.GetNamespace(),
}
crdKind := "CustomResourceDefinition"
var list apiextensionsv1.CustomResourceDefinitionList
if err := kubeClient.List(ctx, &list, selector); err == nil {
for _, crd := range list.Items {
found := false
for _, r := range result {
if r.Name == crd.GetName() && r.GroupKind == crd.GroupVersionKind().GroupKind() {
if r.Name == crd.GetName() && r.GroupKind.Kind == crdKind {
found = true
break
}
@@ -312,7 +313,10 @@ func getHelmReleaseInventory(ctx context.Context, objectKey client.ObjectKey, ku
if !found {
result = append(result, object.ObjMetadata{
Name: crd.GetName(),
GroupKind: crd.GroupVersionKind().GroupKind(),
GroupKind: schema.GroupKind{
Group: apiextensionsv1.GroupName,
Kind: crdKind,
},
})
}
}