[Helm] Remove from SupportsOwnerReference

Signed-off-by: varshaprasad96 <[email protected]>

Author: varshaprasad96

internal/controller/controller.go

@@ -159,7 +159,7 @@ func watchDependentResources(mgr manager.Manager, r *HelmOperatorReconciler, c c
 				}
 
 				restMapper := mgr.GetRESTMapper()
-				useOwnerRef, err := controllerutil.SupportsOwnerReference(restMapper, owner, dependent, "")
+				useOwnerRef, err := controllerutil.SupportsOwnerReference(restMapper, owner, dependent)
 				if err != nil {
 					return err
 				}

main.go

@@ -27,7 +27,6 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/stage"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
 
-	helmcmd "github.com/operator-framework/helm-operator-plugins/internal/cmd/helm-operator/run"
 	hybridcmd "github.com/operator-framework/helm-operator-plugins/internal/cmd/hybrid-operator/run"
 	"github.com/operator-framework/helm-operator-plugins/internal/version"
 	pluginv1 "github.com/operator-framework/helm-operator-plugins/pkg/plugins/helm/v1"
@@ -39,18 +38,16 @@ import (
 func main() {
 	commands := []*cobra.Command{
 		hybridcmd.NewCmd(),
-		helmcmd.NewCmd(),
 	}
 	c, err := cli.New(
 		cli.WithCommandName("helm-operator"),
 		cli.WithVersion(getVersion()),
 		cli.WithPlugins(
 			getHybridPlugin(),
 			golangv3.Plugin{},
-			getHelmPlugin(),
 		),
 		cli.WithDefaultProjectVersion(config.Version),
-		cli.WithDefaultPlugins(config.Version, getHybridPlugin(), getHelmPlugin()),
+		cli.WithDefaultPlugins(config.Version, getHybridPlugin()),
 		cli.WithExtraCommands(commands...),
 	)
 	if err != nil {

pkg/client/actionclient.go

@@ -322,7 +322,7 @@ func (pr *ownerPostRenderer) Run(in *bytes.Buffer) (*bytes.Buffer, error) {
 			return err
 		}
 		u := &unstructured.Unstructured{Object: objMap}
-		useOwnerRef, err := controllerutil.SupportsOwnerReference(pr.rm, pr.owner, u, "")
+		useOwnerRef, err := controllerutil.SupportsOwnerReference(pr.rm, pr.owner, u)
 		if err != nil {
 			return err
 		}

pkg/client/helm/client/client.go

@@ -140,7 +140,7 @@ func (c *ownerRefInjectingClient) Build(reader io.Reader, validate bool) (kube.R
 			return err
 		}
 		u := &unstructured.Unstructured{Object: objMap}
-		useOwnerRef, err := controllerutil.SupportsOwnerReference(c.restMapper, c.owner, u, "")
+		useOwnerRef, err := controllerutil.SupportsOwnerReference(c.restMapper, c.owner, u)
 		if err != nil {
 			return err
 		}

pkg/reconciler/internal/hook/hook.go

@@ -73,7 +73,7 @@ func (d *dependentResourceWatcher) Exec(owner *unstructured.Unstructured, rel re
 			continue
 		}
 
-		useOwnerRef, err := controllerutil.SupportsOwnerReference(d.restMapper, owner, &obj, "")
+		useOwnerRef, err := controllerutil.SupportsOwnerReference(d.restMapper, owner, &obj)
 		if err != nil {
 			return err
 		}

pkg/sdk/controllerutil/controllerutil.go

@@ -57,7 +57,7 @@ func WaitForDeletion(ctx context.Context, cl client.Reader, o client.Object) err
 	}, ctx.Done())
 }
 
-func SupportsOwnerReference(restMapper meta.RESTMapper, owner, dependent runtime.Object, depNamespace string) (bool, error) {
+func SupportsOwnerReference(restMapper meta.RESTMapper, owner, dependent runtime.Object) (bool, error) {
 	ownerGVK := owner.GetObjectKind().GroupVersionKind()
 	ownerMapping, err := restMapper.RESTMapping(ownerGVK.GroupKind(), ownerGVK.Version)
 	if err != nil {
@@ -83,9 +83,8 @@ func SupportsOwnerReference(restMapper meta.RESTMapper, owner, dependent runtime
 	ownerClusterScoped := ownerMapping.Scope.Name() == meta.RESTScopeNameRoot
 	ownerNamespace := mOwner.GetNamespace()
 	depClusterScoped := depMapping.Scope.Name() == meta.RESTScopeNameRoot
-	if depNamespace == "" {
-		depNamespace = mDep.GetNamespace()
-	}
+
+	depNamespace := mDep.GetNamespace()
 
 	if ownerClusterScoped {
 		return true, nil

pkg/sdk/controllerutil/controllerutil_test.go

@@ -91,13 +91,13 @@ var _ = Describe("Controllerutil", func() {
 				})
 				It("should be true for cluster-scoped dependents", func() {
 					dependent = createObject(clusterScoped, types.NamespacedName{Namespace: "", Name: "dependent"})
-					supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent, "")
+					supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent)
 					Expect(supportsOwnerRef).To(BeTrue())
 					Expect(err).To(BeNil())
 				})
 				It("should be true for namespace-scoped dependents", func() {
 					dependent = createObject(namespaceScoped, types.NamespacedName{Namespace: "ns1", Name: "dependent"})
-					supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent, "")
+					supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent)
 					Expect(supportsOwnerRef).To(BeTrue())
 					Expect(err).To(BeNil())
 				})
@@ -108,22 +108,22 @@ var _ = Describe("Controllerutil", func() {
 				})
 				It("should be false for cluster-scoped dependents", func() {
 					dependent = createObject(clusterScoped, types.NamespacedName{Namespace: "", Name: "dependent"})
-					supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent, dependent.GetNamespace())
+					supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent)
 					Expect(supportsOwnerRef).To(BeFalse())
 					Expect(err).To(BeNil())
 				})
 				When("dependent is in owner namespace", func() {
 					It("should be true", func() {
 						dependent = createObject(namespaceScoped, types.NamespacedName{Namespace: "ns1", Name: "dependent"})
-						supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent, "")
+						supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent)
 						Expect(supportsOwnerRef).To(BeTrue())
 						Expect(err).To(BeNil())
 					})
 				})
 				When("dependent is not in owner namespace", func() {
 					It("should be false", func() {
 						dependent = createObject(namespaceScoped, types.NamespacedName{Namespace: "ns2", Name: "dependent"})
-						supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent, "")
+						supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent)
 						Expect(supportsOwnerRef).To(BeFalse())
 						Expect(err).To(BeNil())
 					})
@@ -140,13 +140,13 @@ var _ = Describe("Controllerutil", func() {
 				rm = meta.NewDefaultRESTMapper([]schema.GroupVersion{})
 			})
 			It("fails when owner REST mapping is missing", func() {
-				supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent, "")
+				supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent)
 				Expect(supportsOwnerRef).To(BeFalse())
 				Expect(err).NotTo(BeNil())
 			})
 			It("fails when dependent REST mapping is missing", func() {
 				rm.Add(clusterScoped, meta.RESTScopeRoot)
-				supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent, "")
+				supportsOwnerRef, err := SupportsOwnerReference(rm, owner, dependent)
 				Expect(supportsOwnerRef).To(BeFalse())
 				Expect(err).NotTo(BeNil())
 			})