From 205346f96777deec19c557a2e5053b8d456961f4 Mon Sep 17 00:00:00 2001 From: ary1992 Date: Tue, 20 Jun 2023 11:52:42 +0530 Subject: [PATCH] Adapt `Refactor source/handler/predicate packages to remove dep injection` https://github.com/kubernetes-sigs/controller-runtime/pull/2120 --- extensions/pkg/controller/backupbucket/controller.go | 4 ++-- extensions/pkg/controller/backupentry/controller.go | 6 +++--- extensions/pkg/controller/bastion/controller.go | 2 +- .../pkg/controller/containerruntime/controller.go | 4 ++-- extensions/pkg/controller/controlplane/controller.go | 4 ++-- extensions/pkg/controller/csimigration/controller.go | 2 +- extensions/pkg/controller/dnsrecord/controller.go | 4 ++-- extensions/pkg/controller/extension/controller.go | 4 ++-- extensions/pkg/controller/healthcheck/controller.go | 4 ++-- .../pkg/controller/infrastructure/controller.go | 4 ++-- extensions/pkg/controller/network/controller.go | 4 ++-- .../controller/operatingsystemconfig/controller.go | 2 +- extensions/pkg/controller/worker/controller.go | 8 ++++---- pkg/controllermanager/controller/bastion/add.go | 2 +- .../controller/controllerregistration/seed/add.go | 12 ++++++------ .../controller/managedseedset/add.go | 2 +- .../controller/project/activity/add.go | 8 ++++---- .../controller/seed/backupbucketscheck/add.go | 2 +- .../controller/seed/extensionscheck/add.go | 2 +- pkg/controllermanager/controller/seed/secrets/add.go | 2 +- .../controller/shoot/conditions/add.go | 2 +- pkg/provider-local/controller/ingress/add.go | 2 +- .../controller/managedresource/add.go | 2 +- pkg/resourcemanager/controller/secret/add.go | 2 +- 24 files changed, 45 insertions(+), 45 deletions(-) diff --git a/extensions/pkg/controller/backupbucket/controller.go b/extensions/pkg/controller/backupbucket/controller.go index dd4e41daf4b..b9f41c5421a 100644 --- a/extensions/pkg/controller/backupbucket/controller.go +++ b/extensions/pkg/controller/backupbucket/controller.go @@ -76,12 +76,12 @@ func add(mgr manager.Manager, args AddArgs, predicates []predicate.Predicate) er if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &corev1.Secret{}}, + source.Kind(mgr.GetCache(), &corev1.Secret{}), mapper.EnqueueRequestsFrom(SecretToBackupBucketMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.BackupBucket{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.BackupBucket{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/backupentry/controller.go b/extensions/pkg/controller/backupentry/controller.go index be826d08f9f..5b4de2ba234 100644 --- a/extensions/pkg/controller/backupentry/controller.go +++ b/extensions/pkg/controller/backupentry/controller.go @@ -75,19 +75,19 @@ func add(mgr manager.Manager, args AddArgs, predicates []predicate.Predicate) er if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &corev1.Namespace{}}, + source.Kind(mgr.GetCache(), &corev1.Namespace{}), mapper.EnqueueRequestsFrom(NamespaceToBackupEntryMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } if err := ctrl.Watch( - &source.Kind{Type: &corev1.Secret{}}, + source.Kind(mgr.GetCache(), &corev1.Secret{}), mapper.EnqueueRequestsFrom(SecretToBackupEntryMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.BackupEntry{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.BackupEntry{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/bastion/controller.go b/extensions/pkg/controller/bastion/controller.go index 8ee22c49b44..4d36af28e92 100644 --- a/extensions/pkg/controller/bastion/controller.go +++ b/extensions/pkg/controller/bastion/controller.go @@ -69,5 +69,5 @@ func add(mgr manager.Manager, args AddArgs, predicates []predicate.Predicate) er return err } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.Bastion{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.Bastion{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/containerruntime/controller.go b/extensions/pkg/controller/containerruntime/controller.go index 2c1305e57ef..98783447336 100644 --- a/extensions/pkg/controller/containerruntime/controller.go +++ b/extensions/pkg/controller/containerruntime/controller.go @@ -78,12 +78,12 @@ func add(mgr manager.Manager, args AddArgs) error { if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(ClusterToContainerResourceMapper(predicates...), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.ContainerRuntime{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.ContainerRuntime{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/controlplane/controller.go b/extensions/pkg/controller/controlplane/controller.go index 1ba657bbf5d..b942c5318a5 100644 --- a/extensions/pkg/controller/controlplane/controller.go +++ b/extensions/pkg/controller/controlplane/controller.go @@ -70,12 +70,12 @@ func Add(mgr manager.Manager, args AddArgs) error { predicates := extensionspredicate.AddTypePredicate(args.Predicates, args.Type) if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(ClusterToControlPlaneMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.ControlPlane{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.ControlPlane{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/csimigration/controller.go b/extensions/pkg/controller/csimigration/controller.go index 406074f57dc..71859ea9722 100644 --- a/extensions/pkg/controller/csimigration/controller.go +++ b/extensions/pkg/controller/csimigration/controller.go @@ -73,5 +73,5 @@ func Add(mgr manager.Manager, args AddArgs) error { } ) - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.Cluster{}}, &handler.EnqueueRequestForObject{}, append(defaultPredicates, args.Predicates...)...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), &handler.EnqueueRequestForObject{}, append(defaultPredicates, args.Predicates...)...) } diff --git a/extensions/pkg/controller/dnsrecord/controller.go b/extensions/pkg/controller/dnsrecord/controller.go index a47fc007b28..f0013380a33 100644 --- a/extensions/pkg/controller/dnsrecord/controller.go +++ b/extensions/pkg/controller/dnsrecord/controller.go @@ -78,12 +78,12 @@ func Add(mgr manager.Manager, args AddArgs) error { predicates := extensionspredicate.AddTypePredicate(args.Predicates, args.Type) if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(ClusterToDNSRecordMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.DNSRecord{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.DNSRecord{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/extension/controller.go b/extensions/pkg/controller/extension/controller.go index c69afe42164..42a3c03fca6 100644 --- a/extensions/pkg/controller/extension/controller.go +++ b/extensions/pkg/controller/extension/controller.go @@ -78,12 +78,12 @@ func add(mgr manager.Manager, args AddArgs) error { if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(ClusterToExtensionMapper(predicates...), mapper.UpdateWithNew, mgr.GetLogger().WithName(args.Name)), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.Extension{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.Extension{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/healthcheck/controller.go b/extensions/pkg/controller/healthcheck/controller.go index 868145d83e7..ac5b2c4a1fc 100644 --- a/extensions/pkg/controller/healthcheck/controller.go +++ b/extensions/pkg/controller/healthcheck/controller.go @@ -181,14 +181,14 @@ func add(mgr manager.Manager, args AddArgs) error { // add type predicate to only watch registered resource (e.g ControlPlane) with a certain type (e.g aws) predicates := extensionspredicate.AddTypePredicate(args.Predicates, args.Type) - if err := ctrl.Watch(&source.Kind{Type: args.registeredExtension.getExtensionObjFunc()}, &handler.EnqueueRequestForObject{}, predicates...); err != nil { + if err := ctrl.Watch(source.Kind(mgr.GetCache(), args.registeredExtension.getExtensionObjFunc()), &handler.EnqueueRequestForObject{}, predicates...); err != nil { return err } // watch Cluster of Shoot provider type (e.g aws) // this is to be notified when the Shoot is being hibernated (stop health checks) and wakes up (start health checks again) return ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(mapper.ClusterToObjectMapper(args.GetExtensionObjListFunc, predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ) } diff --git a/extensions/pkg/controller/infrastructure/controller.go b/extensions/pkg/controller/infrastructure/controller.go index e4a6b0b3838..d76b92422a3 100644 --- a/extensions/pkg/controller/infrastructure/controller.go +++ b/extensions/pkg/controller/infrastructure/controller.go @@ -78,7 +78,7 @@ func add(mgr manager.Manager, args AddArgs) error { predicates := extensionspredicate.AddTypePredicate(args.Predicates, args.Type) - if err := ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.Infrastructure{}}, &handler.EnqueueRequestForObject{}, predicates...); err != nil { + if err := ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.Infrastructure{}), &handler.EnqueueRequestForObject{}, predicates...); err != nil { return err } @@ -86,7 +86,7 @@ func add(mgr manager.Manager, args AddArgs) error { // is already present & the extension CRD is already deleting if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(ClusterToInfrastructureMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err diff --git a/extensions/pkg/controller/network/controller.go b/extensions/pkg/controller/network/controller.go index 2b4fb0efe59..4a3fbefecac 100644 --- a/extensions/pkg/controller/network/controller.go +++ b/extensions/pkg/controller/network/controller.go @@ -75,12 +75,12 @@ func add(mgr manager.Manager, args AddArgs) error { if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(ClusterToNetworkMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.Network{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.Network{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/operatingsystemconfig/controller.go b/extensions/pkg/controller/operatingsystemconfig/controller.go index bcb762ea065..70f9ac38de1 100644 --- a/extensions/pkg/controller/operatingsystemconfig/controller.go +++ b/extensions/pkg/controller/operatingsystemconfig/controller.go @@ -67,5 +67,5 @@ func add(mgr manager.Manager, options controller.Options, predicates []predicate return err } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.OperatingSystemConfig{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.OperatingSystemConfig{}), &handler.EnqueueRequestForObject{}, predicates...) } diff --git a/extensions/pkg/controller/worker/controller.go b/extensions/pkg/controller/worker/controller.go index 75c16cfa566..a87f9c96e64 100644 --- a/extensions/pkg/controller/worker/controller.go +++ b/extensions/pkg/controller/worker/controller.go @@ -82,14 +82,14 @@ func add(mgr manager.Manager, args AddArgs, predicates []predicate.Predicate) er if args.IgnoreOperationAnnotation { if err := ctrl.Watch( - &source.Kind{Type: &extensionsv1alpha1.Cluster{}}, + source.Kind(mgr.GetCache(), &extensionsv1alpha1.Cluster{}), mapper.EnqueueRequestsFrom(ClusterToWorkerMapper(predicates), mapper.UpdateWithNew, ctrl.GetLogger()), ); err != nil { return err } } - return ctrl.Watch(&source.Kind{Type: &extensionsv1alpha1.Worker{}}, &handler.EnqueueRequestForObject{}, predicates...) + return ctrl.Watch(source.Kind(mgr.GetCache(), &extensionsv1alpha1.Worker{}), &handler.EnqueueRequestForObject{}, predicates...) } func addStateUpdatingController(mgr manager.Manager, options controller.Options, extensionType string) error { @@ -114,7 +114,7 @@ func addStateUpdatingController(mgr manager.Manager, options controller.Options, } if err := ctrl.Watch( - &source.Kind{Type: &machinev1alpha1.MachineSet{}}, + source.Kind(mgr.GetCache(), &machinev1alpha1.MachineSet{}), mapper.EnqueueRequestsFrom(MachineSetToWorkerMapper(workerPredicates), mapper.UpdateWithNew, ctrl.GetLogger()), machinePredicates..., ); err != nil { @@ -122,7 +122,7 @@ func addStateUpdatingController(mgr manager.Manager, options controller.Options, } return ctrl.Watch( - &source.Kind{Type: &machinev1alpha1.Machine{}}, + source.Kind(mgr.GetCache(), &machinev1alpha1.Machine{}), mapper.EnqueueRequestsFrom(MachineToWorkerMapper(workerPredicates), mapper.UpdateWithNew, ctrl.GetLogger()), machinePredicates..., ) diff --git a/pkg/controllermanager/controller/bastion/add.go b/pkg/controllermanager/controller/bastion/add.go index ac037410e94..5d33e65aec1 100644 --- a/pkg/controllermanager/controller/bastion/add.go +++ b/pkg/controllermanager/controller/bastion/add.go @@ -62,7 +62,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &gardencorev1beta1.Shoot{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.Shoot{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapShootToBastions), mapper.UpdateWithNew, c.GetLogger()), r.ShootPredicate(), ) diff --git a/pkg/controllermanager/controller/controllerregistration/seed/add.go b/pkg/controllermanager/controller/controllerregistration/seed/add.go index 84e9ac94533..3f32d239f3a 100644 --- a/pkg/controllermanager/controller/controllerregistration/seed/add.go +++ b/pkg/controllermanager/controller/controllerregistration/seed/add.go @@ -62,7 +62,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.ControllerRegistration{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.ControllerRegistration{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapToAllSeeds), mapper.UpdateWithNew, c.GetLogger()), predicateutils.ForEventTypes(predicateutils.Create, predicateutils.Update), ); err != nil { @@ -70,7 +70,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.BackupBucket{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.BackupBucket{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapBackupBucketToSeed), mapper.UpdateWithNew, c.GetLogger()), r.BackupBucketPredicate(), ); err != nil { @@ -78,7 +78,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.BackupEntry{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.BackupEntry{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapBackupEntryToSeed), mapper.UpdateWithNew, c.GetLogger()), r.BackupEntryPredicate(), ); err != nil { @@ -86,7 +86,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.ControllerInstallation{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.ControllerInstallation{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapControllerInstallationToSeed), mapper.UpdateWithNew, c.GetLogger()), r.ControllerInstallationPredicate(), ); err != nil { @@ -94,7 +94,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.ControllerDeployment{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.ControllerDeployment{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapControllerDeploymentToAllSeeds), mapper.UpdateWithNew, c.GetLogger()), predicateutils.ForEventTypes(predicateutils.Create, predicateutils.Update), ); err != nil { @@ -102,7 +102,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &gardencorev1beta1.Shoot{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.Shoot{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapShootToSeed), mapper.UpdateWithNew, c.GetLogger()), r.ShootPredicate(), ) diff --git a/pkg/controllermanager/controller/managedseedset/add.go b/pkg/controllermanager/controller/managedseedset/add.go index c53cf372460..ff57556b650 100644 --- a/pkg/controllermanager/controller/managedseedset/add.go +++ b/pkg/controllermanager/controller/managedseedset/add.go @@ -86,7 +86,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &gardencorev1beta1.Seed{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.Seed{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapSeedToManagedSeedSet), mapper.UpdateWithNew, c.GetLogger()), r.SeedPredicate(), ) diff --git a/pkg/controllermanager/controller/project/activity/add.go b/pkg/controllermanager/controller/project/activity/add.go index efa7180df57..19cf107116b 100644 --- a/pkg/controllermanager/controller/project/activity/add.go +++ b/pkg/controllermanager/controller/project/activity/add.go @@ -66,7 +66,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.Shoot{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.Shoot{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapObjectToProject), mapper.UpdateWithNew, c.GetLogger()), r.OnlyNewlyCreatedObjects(), predicate.GenerationChangedPredicate{}, @@ -75,7 +75,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.BackupEntry{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.BackupEntry{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapObjectToProject), mapper.UpdateWithNew, c.GetLogger()), r.OnlyNewlyCreatedObjects(), predicate.GenerationChangedPredicate{}, @@ -84,7 +84,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } if err := c.Watch( - &source.Kind{Type: &gardencorev1beta1.Quota{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.Quota{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapObjectToProject), mapper.UpdateWithNew, c.GetLogger()), r.OnlyNewlyCreatedObjects(), r.NeedsSecretBindingReferenceLabelPredicate(), @@ -93,7 +93,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &corev1.Secret{}}, + source.Kind(mgr.GetCache(), &corev1.Secret{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapObjectToProject), mapper.UpdateWithNew, c.GetLogger()), r.OnlyNewlyCreatedObjects(), r.NeedsSecretBindingReferenceLabelPredicate(), diff --git a/pkg/controllermanager/controller/seed/backupbucketscheck/add.go b/pkg/controllermanager/controller/seed/backupbucketscheck/add.go index 7a8e51ffc65..23434c740c9 100644 --- a/pkg/controllermanager/controller/seed/backupbucketscheck/add.go +++ b/pkg/controllermanager/controller/seed/backupbucketscheck/add.go @@ -63,7 +63,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &gardencorev1beta1.BackupBucket{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.BackupBucket{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapBackupBucketToSeed), mapper.UpdateWithNew, c.GetLogger()), r.BackupBucketPredicate(), ) diff --git a/pkg/controllermanager/controller/seed/extensionscheck/add.go b/pkg/controllermanager/controller/seed/extensionscheck/add.go index 929b3b4fe36..a2ac7793cfd 100644 --- a/pkg/controllermanager/controller/seed/extensionscheck/add.go +++ b/pkg/controllermanager/controller/seed/extensionscheck/add.go @@ -62,7 +62,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &gardencorev1beta1.ControllerInstallation{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.ControllerInstallation{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapControllerInstallationToSeed), mapper.UpdateWithNew, c.GetLogger()), predicateutils.RelevantConditionsChanged( func(obj client.Object) []gardencorev1beta1.Condition { diff --git a/pkg/controllermanager/controller/seed/secrets/add.go b/pkg/controllermanager/controller/seed/secrets/add.go index 522318380ae..04f04fd69ba 100644 --- a/pkg/controllermanager/controller/seed/secrets/add.go +++ b/pkg/controllermanager/controller/seed/secrets/add.go @@ -65,7 +65,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &corev1.Secret{}}, + source.Kind(mgr.GetCache(), &corev1.Secret{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapToAllSeeds), mapper.UpdateWithNew, c.GetLogger()), r.GardenSecretPredicate(), r.SecretPredicate(), diff --git a/pkg/controllermanager/controller/shoot/conditions/add.go b/pkg/controllermanager/controller/shoot/conditions/add.go index 3e3f1dc9ef1..c3cc16eef92 100644 --- a/pkg/controllermanager/controller/shoot/conditions/add.go +++ b/pkg/controllermanager/controller/shoot/conditions/add.go @@ -61,7 +61,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { } return c.Watch( - &source.Kind{Type: &gardencorev1beta1.Seed{}}, + source.Kind(mgr.GetCache(), &gardencorev1beta1.Seed{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapSeedToShoot), mapper.UpdateWithNew, c.GetLogger()), r.SeedPredicate(), ) diff --git a/pkg/provider-local/controller/ingress/add.go b/pkg/provider-local/controller/ingress/add.go index c0948c8ffb8..48c0f33f08a 100644 --- a/pkg/provider-local/controller/ingress/add.go +++ b/pkg/provider-local/controller/ingress/add.go @@ -44,7 +44,7 @@ func AddToManagerWithOptions(mgr manager.Manager, opts AddOptions) error { return err } - return ctrl.Watch(&source.Kind{Type: &networkingv1.Ingress{}}, &handler.EnqueueRequestForObject{}) + return ctrl.Watch(source.Kind(mgr.GetCache(), &networkingv1.Ingress{}), &handler.EnqueueRequestForObject{}) } // AddToManager adds a controller with the default Options. diff --git a/pkg/resourcemanager/controller/managedresource/add.go b/pkg/resourcemanager/controller/managedresource/add.go index 873df11b8db..415be93cad7 100644 --- a/pkg/resourcemanager/controller/managedresource/add.go +++ b/pkg/resourcemanager/controller/managedresource/add.go @@ -96,7 +96,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, sourceCluster, targetClus } return c.Watch( - &source.Kind{Type: &corev1.Secret{}}, + source.Kind(mgr.GetCache(), &corev1.Secret{}), mapper.EnqueueRequestsFrom(r.MapSecretToManagedResources( r.ClassFilter, predicate.Or( diff --git a/pkg/resourcemanager/controller/secret/add.go b/pkg/resourcemanager/controller/secret/add.go index 8640b7805a5..1fa8a5c6189 100644 --- a/pkg/resourcemanager/controller/secret/add.go +++ b/pkg/resourcemanager/controller/secret/add.go @@ -53,7 +53,7 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, sourceCluster cluster.Clu resourcemanagerpredicate.HasFinalizer(r.ClassFilter.FinalizerName()), )). WatchesRawSource( - &source.Kind{Type: &resourcesv1alpha1.ManagedResource{}}, + source.Kind(mgr.GetCache(), &resourcesv1alpha1.ManagedResource{}), mapper.EnqueueRequestsFrom(mapper.MapFunc(r.MapManagedResourcesToSecrets), mapper.UpdateWithOldAndNew, logr.Discard()), builder.WithPredicates(predicate.GenerationChangedPredicate{}), ).