[watches] Update controller-runtime v0.16.3

This change updates the ManagedBy Watches initialisation for controller-runtime v0.16 changes Signed-off-by: Brendan Shephard <[email protected]>
openstack-k8s-operators · Feb 14, 2024 · 3e3c412 · 3e3c412
1 parent 11e13cf
commit 3e3c412
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/controllers/network/dnsmasq_controller.go b/controllers/network/dnsmasq_controller.go
@@ -35,7 +35,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/go-logr/logr"
 	networkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
@@ -199,7 +198,7 @@ func (r *DNSMasqReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 // SetupWithManager sets up the controller with the Manager.
 func (r *DNSMasqReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
 	Log := r.GetLogger(ctx)
-	dnsmasqFN := handler.EnqueueRequestsFromMapFunc(func(o client.Object) []reconcile.Request {
+	dnsmasqFN := handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, o client.Object) []reconcile.Request {
 		result := []reconcile.Request{}
 
 		// For each ConfigMap create / update event get the list of all
@@ -266,7 +265,7 @@ func (r *DNSMasqReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manag
 		Owns(&corev1.ServiceAccount{}).
 		Owns(&rbacv1.Role{}).
 		Owns(&rbacv1.RoleBinding{}).
-		Watches(&source.Kind{Type: &corev1.ConfigMap{}},
+		Watches(&corev1.ConfigMap{},
 			dnsmasqFN,
 			builder.WithPredicates(p)).
 		Complete(r)

diff --git a/controllers/network/ipset_controller.go b/controllers/network/ipset_controller.go
@@ -34,7 +34,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/go-logr/logr"
 	networkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
@@ -150,7 +149,7 @@ func (r *IPSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resu
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *IPSetReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
-	ipsetFN := handler.EnqueueRequestsFromMapFunc(func(o client.Object) []reconcile.Request {
+	ipsetFN := handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, o client.Object) []reconcile.Request {
 		Log := r.GetLogger(ctx)
 		result := []reconcile.Request{}
 
@@ -185,7 +184,7 @@ func (r *IPSetReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&networkv1.IPSet{}).
 		Owns(&networkv1.Reservation{}).
-		Watches(&source.Kind{Type: &networkv1.NetConfig{}}, ipsetFN).
+		Watches(&networkv1.NetConfig{}, ipsetFN).
 		Complete(r)
 }
 

diff --git a/controllers/rabbitmq/transporturl_controller.go b/controllers/rabbitmq/transporturl_controller.go
@@ -33,7 +33,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
@@ -150,14 +149,13 @@ func (r *TransportURLReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}()
 
 	return r.reconcileNormal(ctx, instance, helper)
-
 }
 
 func (r *TransportURLReconciler) reconcileNormal(ctx context.Context, instance *rabbitmqv1.TransportURL, helper *helper.Helper) (ctrl.Result, error) {
 	Log := r.GetLogger(ctx)
 	Log.Info("Reconciling Service")
 
-	//TODO (implement a watch on the rabbitmq cluster resources to update things if there are changes)
+	// TODO (implement a watch on the rabbitmq cluster resources to update things if there are changes)
 	rabbit, err := getRabbitmqCluster(ctx, helper, instance)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -326,11 +324,9 @@ const (
 	rabbitmqClusterNameField = ".spec.rabbitmqClusterName"
 )
 
-var (
-	allWatchFields = []string{
-		rabbitmqClusterNameField,
-	}
-)
+var allWatchFields = []string{
+	rabbitmqClusterNameField,
+}
 
 // SetupWithManager sets up the controller with the Manager.
 func (r *TransportURLReconciler) SetupWithManager(mgr ctrl.Manager) error {
@@ -350,14 +346,14 @@ func (r *TransportURLReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&rabbitmqv1.TransportURL{}).
 		Owns(&corev1.Secret{}).
 		Watches(
-			&source.Kind{Type: &rabbitmqclusterv1.RabbitmqCluster{}},
+			&rabbitmqclusterv1.RabbitmqCluster{},
 			handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
 			builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
 		).
 		Complete(r)
 }
 
-func (r *TransportURLReconciler) findObjectsForSrc(src client.Object) []reconcile.Request {
+func (r *TransportURLReconciler) findObjectsForSrc(ctx context.Context, src client.Object) []reconcile.Request {
 	requests := []reconcile.Request{}
 
 	for _, field := range allWatchFields {