Merge pull request #405 from darkowlzz/client-objectkeyfromobject

Use ObjectKeyFromObject instead of ObjectKey
fluxcd · Jul 26, 2021 · dbaf8bf · dbaf8bf
2 parents 40a4767 + 9825a60
commit dbaf8bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 34 deletions.
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -61,7 +61,6 @@ import (
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
 	"github.com/fluxcd/source-controller/internal/helm"
-	"github.com/fluxcd/source-controller/internal/util"
 )
 
 // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmcharts,verbs=get;list;watch;create;update;patch;delete
@@ -926,7 +925,7 @@ func (r *HelmChartReconciler) requestsForHelmRepositoryChange(o client.Object) [
 	//  enqueued twice.
 	var reqs []reconcile.Request
 	for _, i := range list.Items {
-		reqs = append(reqs, reconcile.Request{NamespacedName: util.ObjectKey(&i)})
+		reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&i)})
 	}
 	return reqs
 }
@@ -955,7 +954,7 @@ func (r *HelmChartReconciler) requestsForGitRepositoryChange(o client.Object) []
 	//  enqueued twice.
 	var reqs []reconcile.Request
 	for _, i := range list.Items {
-		reqs = append(reqs, reconcile.Request{NamespacedName: util.ObjectKey(&i)})
+		reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&i)})
 	}
 	return reqs
 }
@@ -984,7 +983,7 @@ func (r *HelmChartReconciler) requestsForBucketChange(o client.Object) []reconci
 	//  enqueued twice.
 	var reqs []reconcile.Request
 	for _, i := range list.Items {
-		reqs = append(reqs, reconcile.Request{NamespacedName: util.ObjectKey(&i)})
+		reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&i)})
 	}
 	return reqs
 }

diff --git a/internal/util/util.go b/internal/util/util.go