Upgrade controller-runtime to v0.15.0 (#293)

src/operator/controllers/intents_controller.go

@@ -45,7 +45,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 var intentsLegacyFinalizers = []string{
@@ -191,7 +190,7 @@ func (r *IntentsReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	err := ctrl.NewControllerManagedBy(mgr).
 		For(&otterizev1alpha3.ClientIntents{}).
 		WithOptions(controller.Options{RecoverPanic: lo.ToPtr(true)}).
-		Watches(&source.Kind{Type: &otterizev1alpha3.ProtectedService{}}, handler.EnqueueRequestsFromMapFunc(r.mapProtectedServiceToClientIntents)).
+		Watches(&otterizev1alpha3.ProtectedService{}, handler.EnqueueRequestsFromMapFunc(r.mapProtectedServiceToClientIntents)).
 		Complete(r)
 	if err != nil {
 		return err
@@ -202,7 +201,7 @@ func (r *IntentsReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return nil
 }
 
-func (r *IntentsReconciler) mapProtectedServiceToClientIntents(obj client.Object) []reconcile.Request {
+func (r *IntentsReconciler) mapProtectedServiceToClientIntents(_ context.Context, obj client.Object) []reconcile.Request {
 	protectedService := obj.(*otterizev1alpha3.ProtectedService)
 	logrus.Infof("Enqueueing client intents for protected services %s", protectedService.Name)
 

src/operator/controllers/intents_controller_test.go

@@ -115,7 +115,7 @@ func (s *IntentsControllerTestSuite) TestMappingProtectedServicesToIntent() {
 			},
 		},
 	}
-	res := s.intentsReconciler.mapProtectedServiceToClientIntents(&protectedService)
+	res := s.intentsReconciler.mapProtectedServiceToClientIntents(context.Background(), &protectedService)
 	s.Require().Equal(expected, res)
 }
 
@@ -138,7 +138,7 @@ func (s *IntentsControllerTestSuite) TestMappingProtectedServicesToIntentNoInten
 	).Return(nil)
 
 	expected := make([]reconcile.Request, 0)
-	res := s.intentsReconciler.mapProtectedServiceToClientIntents(&protectedService)
+	res := s.intentsReconciler.mapProtectedServiceToClientIntents(context.Background(), &protectedService)
 	s.Require().Equal(expected, res)
 }
 

src/operator/controllers/kafkaserverconfig_controller.go

@@ -35,7 +35,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 const (
@@ -100,7 +99,7 @@ func (r *KafkaServerConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		// Uncomment the following line adding a pointer to an instance of the controlled resource as an argument
 		For(&otterizev1alpha3.KafkaServerConfig{}).
 		WithOptions(controller.Options{RecoverPanic: lo.ToPtr(true)}).
-		Watches(&source.Kind{Type: &otterizev1alpha3.ProtectedService{}}, handler.EnqueueRequestsFromMapFunc(r.mapProtectedServiceToKafkaServerConfig)).
+		Watches(&otterizev1alpha3.ProtectedService{}, handler.EnqueueRequestsFromMapFunc(r.mapProtectedServiceToKafkaServerConfig)).
 		Complete(r)
 	if err != nil {
 		return err
@@ -122,11 +121,11 @@ func (r *KafkaServerConfigReconciler) InitKafkaServerConfigIndices(mgr ctrl.Mana
 		})
 }
 
-func (r *KafkaServerConfigReconciler) mapProtectedServiceToKafkaServerConfig(obj client.Object) []reconcile.Request {
+func (r *KafkaServerConfigReconciler) mapProtectedServiceToKafkaServerConfig(ctx context.Context, obj client.Object) []reconcile.Request {
 	protectedService := obj.(*otterizev1alpha3.ProtectedService)
 	logrus.Infof("Enqueueing KafkaServerConfigs for protected service %s", protectedService.Name)
 
-	kscsToReconcile := r.getKSCsForProtectedService(protectedService)
+	kscsToReconcile := r.getKSCsForProtectedService(ctx, protectedService)
 	return lo.Map(kscsToReconcile, func(ksc otterizev1alpha3.KafkaServerConfig, _ int) reconcile.Request {
 		return reconcile.Request{
 			NamespacedName: types.NamespacedName{
@@ -137,10 +136,10 @@ func (r *KafkaServerConfigReconciler) mapProtectedServiceToKafkaServerConfig(obj
 	})
 }
 
-func (r *KafkaServerConfigReconciler) getKSCsForProtectedService(protectedService *otterizev1alpha3.ProtectedService) []otterizev1alpha3.KafkaServerConfig {
+func (r *KafkaServerConfigReconciler) getKSCsForProtectedService(ctx context.Context, protectedService *otterizev1alpha3.ProtectedService) []otterizev1alpha3.KafkaServerConfig {
 	kscsToReconcile := make([]otterizev1alpha3.KafkaServerConfig, 0)
 	var kafkaServerConfigs otterizev1alpha3.KafkaServerConfigList
-	err := r.Client.List(context.Background(),
+	err := r.Client.List(ctx,
 		&kafkaServerConfigs,
 		&client.MatchingFields{otterizev1alpha3.OtterizeKafkaServerConfigServiceNameField: protectedService.Spec.Name},
 		&client.ListOptions{Namespace: protectedService.Namespace},

src/operator/controllers/pod_reconcilers/namespace.go

@@ -67,7 +67,7 @@ func (ns *NamespaceWatcher) Register(mgr manager.Manager) error {
 		return fmt.Errorf("unable to set up namespace controller: %w", err)
 	}
 
-	if err = watcher.Watch(&source.Kind{Type: &v1.Namespace{}}, &handler.EnqueueRequestForObject{}); err != nil {
+	if err = watcher.Watch(source.Kind(mgr.GetCache(), &v1.Namespace{}), &handler.EnqueueRequestForObject{}); err != nil {
 		return fmt.Errorf("unable to watch Namespaces: %w", err)
 	}
 

src/operator/controllers/pod_reconcilers/pods.go

@@ -281,7 +281,7 @@ func (p *PodWatcher) Register(mgr manager.Manager) error {
 		return fmt.Errorf("unable to set up pods controller: %p", err)
 	}
 
-	if err = watcher.Watch(&source.Kind{Type: &v1.Pod{}}, &handler.EnqueueRequestForObject{}); err != nil {
+	if err = watcher.Watch(source.Kind(mgr.GetCache(), &v1.Pod{}), &handler.EnqueueRequestForObject{}); err != nil {
 		return fmt.Errorf("unable to watch Pods: %p", err)
 	}
 

src/operator/main.go

@@ -40,7 +40,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/metadata"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
@@ -148,7 +147,7 @@ func main() {
 	}
 
 	if len(watchedNamespaces) != 0 {
-		options.NewCache = cache.MultiNamespacedCacheBuilder(watchedNamespaces)
+		options.Cache.Namespaces = watchedNamespaces
 		logrus.Infof("Will only watch the following namespaces: %v", watchedNamespaces)
 	}
 

src/operator/webhooks/clientintents_webhook.go

@@ -27,6 +27,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 	"strings"
 )
 
@@ -52,12 +53,12 @@ func NewIntentsValidatorV1alpha2(c client.Client) *IntentsValidator {
 var _ webhook.CustomValidator = &IntentsValidator{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (v *IntentsValidator) ValidateCreate(ctx context.Context, obj runtime.Object) error {
+func (v *IntentsValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	intentsObj := obj.(*otterizev1alpha2.ClientIntents)
 	intentsList := &otterizev1alpha2.ClientIntentsList{}
 	if err := v.List(ctx, intentsList, &client.ListOptions{Namespace: intentsObj.Namespace}); err != nil {
-		return err
+		return nil, err
 	}
 	if err := v.validateNoDuplicateClients(intentsObj, intentsList); err != nil {
 		allErrs = append(allErrs, err)
@@ -68,22 +69,22 @@ func (v *IntentsValidator) ValidateCreate(ctx context.Context, obj runtime.Objec
 	}
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
 	gvk := intentsObj.GroupVersionKind()
-	return errors.NewInvalid(
+	return nil, errors.NewInvalid(
 		schema.GroupKind{Group: gvk.Group, Kind: gvk.Kind},
 		intentsObj.Name, allErrs)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (v *IntentsValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) error {
+func (v *IntentsValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	intentsObj := newObj.(*otterizev1alpha2.ClientIntents)
 	intentsList := &otterizev1alpha2.ClientIntentsList{}
 	if err := v.List(ctx, intentsList, &client.ListOptions{Namespace: intentsObj.Namespace}); err != nil {
-		return err
+		return nil, err
 	}
 	if err := v.validateNoDuplicateClients(intentsObj, intentsList); err != nil {
 		allErrs = append(allErrs, err)
@@ -94,18 +95,18 @@ func (v *IntentsValidator) ValidateUpdate(ctx context.Context, oldObj, newObj ru
 	}
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
 	gvk := intentsObj.GroupVersionKind()
-	return errors.NewInvalid(
+	return nil, errors.NewInvalid(
 		schema.GroupKind{Group: gvk.Group, Kind: gvk.Kind},
 		intentsObj.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (v *IntentsValidator) ValidateDelete(ctx context.Context, obj runtime.Object) error {
-	return nil
+func (v *IntentsValidator) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	return nil, nil
 }
 
 func (v *IntentsValidator) validateNoDuplicateClients(