Use ByObject instead of SelectorsByObject

kubernetes-sigs/controller-runtime#2166 Byobject
ary1992 · Jun 21, 2023 · 73ba9f2 · 73ba9f2
1 parent 3cff0a2
commit 73ba9f2
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git a/cmd/gardenlet/app/app.go b/cmd/gardenlet/app/app.go
@@ -265,7 +265,7 @@ func (g *garden) Start(ctx context.Context) error {
 
 		opts.NewCache = func(config *rest.Config, opts cache.Options) (cache.Cache, error) {
 			// gardenlet should watch only objects which are related to the seed it is responsible for.
-			opts.SelectorsByObject = map[client.Object]cache.ObjectSelector{
+			opts.ByObject = map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerInstallation{}: {
 					Field: fields.SelectorFromSet(fields.Set{core.SeedRefName: g.config.SeedConfig.SeedTemplate.Name}),
 				},

diff --git a/pkg/client/kubernetes/cache/single_object.go b/pkg/client/kubernetes/cache/single_object.go
@@ -203,7 +203,7 @@ func (s *singleObject) createAndStartCache(log logr.Logger, key client.ObjectKey
 	opts := s.opts()
 	opts.Namespace = key.Namespace
 	opts.DefaultSelector = cache.ObjectSelector{Field: fields.SelectorFromSet(fields.Set{metav1.ObjectNameField: key.Name})}
-	opts.SelectorsByObject = nil
+	opts.ByObject = nil
 
 	log.V(1).Info("Creating new cache")
 	cache, err := s.newCache(s.restConfig, opts)

diff --git a/pkg/client/kubernetes/cache/single_object_test.go b/pkg/client/kubernetes/cache/single_object_test.go
@@ -73,7 +73,7 @@ var _ = Describe("SingleObject", func() {
 		newCacheFunc := func(_ *rest.Config, opts cache.Options) (cache.Cache, error) {
 			Expect(opts.Namespace).To(Equal(obj.Namespace))
 			Expect(opts.DefaultSelector).To(Equal(cache.ObjectSelector{Field: fields.SelectorFromSet(fields.Set{"metadata.name": obj.Name})}))
-			Expect(opts.SelectorsByObject).To(BeNil())
+			Expect(opts.ByObject).To(BeNil())
 			Expect(opts.Resync).To(Equal(resync))
 			return mockCache, nil
 		}

diff --git a/...ation/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go b/...ation/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go
@@ -108,7 +108,7 @@ var _ = BeforeSuite(func() {
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&certificatesv1.CertificateSigningRequest{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/controllermanager/cloudprofile/cloudprofile_suite_test.go b/test/integration/controllermanager/cloudprofile/cloudprofile_suite_test.go
@@ -108,7 +108,7 @@ var _ = BeforeSuite(func() {
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.CloudProfile{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/...integration/controllermanager/controllerregistration/controllerregistration_suite_test.go b/...integration/controllermanager/controllerregistration/controllerregistration_suite_test.go
@@ -108,7 +108,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerRegistration{}: {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 				&gardencorev1beta1.Seed{}:                   {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 			},

diff --git a/test/integration/controllermanager/exposureclass/exposureclass_suite_test.go b/test/integration/controllermanager/exposureclass/exposureclass_suite_test.go
@@ -111,7 +111,7 @@ var _ = BeforeSuite(func() {
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ExposureClass{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/controllermanager/project/project/project_suite_test.go b/test/integration/controllermanager/project/project/project_suite_test.go
@@ -100,7 +100,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.Project{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/controllermanager/seed/backupbucketscheck/backupbucketscheck_suite_test.go b/test/integration/controllermanager/seed/backupbucketscheck/backupbucketscheck_suite_test.go
@@ -95,7 +95,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.BackupBucket{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/controllermanager/seed/extensionscheck/extensionscheck_suite_test.go b/test/integration/controllermanager/seed/extensionscheck/extensionscheck_suite_test.go
@@ -100,7 +100,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerInstallation{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/controllermanager/seed/secrets/secrets_suite_test.go b/test/integration/controllermanager/seed/secrets/secrets_suite_test.go
@@ -104,7 +104,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.Seed{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/gardenlet/backupbucket/backupbucket_suite_test.go b/test/integration/gardenlet/backupbucket/backupbucket_suite_test.go
@@ -212,7 +212,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.BackupBucket{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 					Field: fields.SelectorFromSet(fields.Set{gardencore.BackupBucketSeedName: seed.Name}),

diff --git a/test/integration/gardenlet/backupentry/backupentry/backupentry_suite_test.go b/test/integration/gardenlet/backupentry/backupentry/backupentry_suite_test.go
@@ -217,7 +217,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.BackupBucket{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/gardenlet/bastion/bastion_suite_test.go b/test/integration/gardenlet/bastion/bastion_suite_test.go
@@ -158,7 +158,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&operationsv1alpha1.Bastion{}: {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 				&gardencorev1beta1.Seed{}:     {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 				&gardencorev1beta1.Shoot{}:    {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},

diff --git a/test/integration/gardenlet/controllerinstallation/care/care_suite_test.go b/test/integration/gardenlet/controllerinstallation/care/care_suite_test.go
@@ -126,7 +126,7 @@ var _ = BeforeSuite(func() {
 		MetricsBindAddress: "0",
 		Namespace:          gardenNamespace.Name,
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerInstallation{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/...denlet/controllerinstallation/controllerinstallation/controllerinstallation_suite_test.go b/...denlet/controllerinstallation/controllerinstallation/controllerinstallation_suite_test.go
@@ -187,7 +187,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerInstallation{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 					Field: fields.SelectorFromSet(fields.Set{gardencore.SeedRefName: seed.Name}),

diff --git a/test/integration/gardenlet/managedseed/managedseed_suite_test.go b/test/integration/gardenlet/managedseed/managedseed_suite_test.go
@@ -182,7 +182,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&seedmanagementv1alpha1.ManagedSeed{}: {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 				&gardencorev1beta1.Shoot{}:            {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 				&gardencorev1beta1.SecretBinding{}:    {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},

diff --git a/test/integration/gardenlet/networkpolicy/networkpolicy_suite_test.go b/test/integration/gardenlet/networkpolicy/networkpolicy_suite_test.go
@@ -147,7 +147,7 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&corev1.Namespace{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/gardenlet/seed/care/care_suite_test.go b/test/integration/gardenlet/seed/care/care_suite_test.go
@@ -129,7 +129,7 @@ var _ = BeforeSuite(func() {
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.Seed{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},

diff --git a/test/integration/gardenlet/seed/seed/seed_test.go b/test/integration/gardenlet/seed/seed/seed_test.go
@@ -97,7 +97,7 @@ var _ = Describe("Seed controller tests", func() {
 			MetricsBindAddress: "0",
 			NewCache: cache.BuilderWithOptions(cache.Options{
 				Mapper: mapper,
-				SelectorsByObject: map[client.Object]cache.ObjectSelector{
+				ByObject: map[client.Object]cache.ByObject{
 					&gardencorev1beta1.Seed{}: {
 						Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 					},

diff --git a/test/integration/operator/garden/garden_test.go b/test/integration/operator/garden/garden_test.go
@@ -118,7 +118,7 @@ var _ = Describe("Garden controller tests", func() {
 			MetricsBindAddress: "0",
 			NewCache: cache.BuilderWithOptions(cache.Options{
 				Mapper: mapper,
-				SelectorsByObject: map[client.Object]cache.ObjectSelector{
+				ByObject: map[client.Object]cache.ByObject{
 					&operatorv1alpha1.Garden{}: {
 						Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 					},

diff --git a/test/integration/resourcemanager/node/node_suite_test.go b/test/integration/resourcemanager/node/node_suite_test.go
@@ -104,7 +104,7 @@ var _ = BeforeSuite(func() {
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
 		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: map[client.Object]cache.ObjectSelector{
+			ByObject: map[client.Object]cache.ByObject{
 				&corev1.Node{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},