From f1c8cd010b9c68203166ed175858b5561a3d2edf Mon Sep 17 00:00:00 2001 From: doronkg Date: Tue, 20 Aug 2024 02:06:46 +0300 Subject: [PATCH] fix: Multi output grouping by namespace --- pkg/kor/multi.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/kor/multi.go b/pkg/kor/multi.go index 38aa5b9e..914ca6d5 100644 --- a/pkg/kor/multi.go +++ b/pkg/kor/multi.go @@ -103,6 +103,10 @@ func GetUnusedMulti(resourceNames string, filterOpts *filters.Options, clientset resources := make(map[string]map[string][]ResourceInfo) var err error + if opts.GroupBy == "namespace" { + resources[""] = make(map[string][]ResourceInfo) + } + noNamespaceDiff, resourceList := retrieveNoNamespaceDiff(clientset, apiExtClient, dynamicClient, resourceList, filterOpts) if len(noNamespaceDiff) != 0 { for _, diff := range noNamespaceDiff { @@ -114,7 +118,6 @@ func GetUnusedMulti(resourceNames string, filterOpts *filters.Options, clientset } switch opts.GroupBy { case "namespace": - resources[""] = make(map[string][]ResourceInfo) resources[""][diff.resourceType] = diff.diff case "resource": appendResources(resources, diff.resourceType, "", diff.diff) @@ -125,6 +128,10 @@ func GetUnusedMulti(resourceNames string, filterOpts *filters.Options, clientset for _, namespace := range namespaces { allDiffs := retrieveNamespaceDiffs(clientset, namespace, resourceList, filterOpts) + if opts.GroupBy == "namespace" { + resources[namespace] = make(map[string][]ResourceInfo) + } + for _, diff := range allDiffs { if opts.DeleteFlag { if diff.diff, err = DeleteResource(diff.diff, clientset, namespace, diff.resourceType, opts.NoInteractive); err != nil { @@ -133,7 +140,6 @@ func GetUnusedMulti(resourceNames string, filterOpts *filters.Options, clientset } switch opts.GroupBy { case "namespace": - resources[namespace] = make(map[string][]ResourceInfo) resources[namespace][diff.resourceType] = diff.diff case "resource": appendResources(resources, diff.resourceType, namespace, diff.diff)