Use IsObjectNamespaced from controller-runtime

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
fluxcd · Dec 12, 2023 · 2b653f9 · 2b653f9
1 parent b4f5d12
commit 2b653f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 69 deletions.
diff --git a/cmd/flux/tree_kustomization.go b/cmd/flux/tree_kustomization.go
@@ -32,6 +32,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 	"sigs.k8s.io/yaml"
 
 	"github.com/fluxcd/cli-utils/pkg/object"
@@ -268,12 +269,8 @@ func getHelmReleaseInventory(ctx context.Context, objectKey client.ObjectKey, ku
 	// set the namespace on namespaced objects
 	for _, obj := range objects {
 		if obj.GetNamespace() == "" {
-			if isNamespaced, _ := utils.IsAPINamespaced(obj, kubeClient.Scheme(), kubeClient.RESTMapper()); isNamespaced {
-				if hr.Spec.TargetNamespace != "" {
-					obj.SetNamespace(hr.Spec.TargetNamespace)
-				} else {
-					obj.SetNamespace(hr.GetNamespace())
-				}
+			if isNamespaced, _ := apiutil.IsObjectNamespaced(obj, kubeClient.Scheme(), kubeClient.RESTMapper()); isNamespaced {
+				obj.SetNamespace(latest.Namespace)
 			}
 		}
 	}

diff --git a/internal/utils/objectutil.go b/internal/utils/objectutil.go