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

flux tree: Set CRDs GroupKind in output

Browse Source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan
2023-02-01 12:41:35 +02:00
parent 0361a08aa0
commit 87232fd4dd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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