Remove cache.BuilderWithOptions and use Cache instead.

kubernetes-sigs/controller-runtime#2300
ary1992 · Jun 21, 2023 · c203afd · c203afd
1 parent 73ba9f2
commit c203afd
Show file tree

Hide file tree

Showing 30 changed files with 60 additions and 60 deletions.
diff --git a/...ation/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go b/...ation/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go
@@ -107,13 +107,13 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&certificatesv1.CertificateSigningRequest{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/test/integration/controllermanager/cloudprofile/cloudprofile_suite_test.go b/test/integration/controllermanager/cloudprofile/cloudprofile_suite_test.go
@@ -107,13 +107,13 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.CloudProfile{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/controllermanager/controllerdeployment/controllerdeployment_suite_test.go b/test/integration/controllermanager/controllerdeployment/controllerdeployment_suite_test.go
@@ -111,11 +111,11 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	mgrClient = mgr.GetClient()
 	Expect(err).NotTo(HaveOccurred())

diff --git a/...integration/controllermanager/controllerregistration/controllerregistration_suite_test.go b/...integration/controllermanager/controllerregistration/controllerregistration_suite_test.go
@@ -107,12 +107,12 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerRegistration{}: {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 				&gardencorev1beta1.Seed{}:                   {Label: labels.SelectorFromSet(labels.Set{testID: testRunID})},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/test/integration/controllermanager/exposureclass/exposureclass_suite_test.go b/test/integration/controllermanager/exposureclass/exposureclass_suite_test.go
@@ -110,13 +110,13 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ExposureClass{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/controllermanager/managedseedset/managedseedset_suite_test.go b/test/integration/controllermanager/managedseedset/managedseedset_suite_test.go
@@ -105,11 +105,11 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/controllermanager/project/activity/activity_suite_test.go b/test/integration/controllermanager/project/activity/activity_suite_test.go
@@ -94,11 +94,11 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/controllermanager/project/project/project_suite_test.go b/test/integration/controllermanager/project/project/project_suite_test.go
@@ -99,13 +99,13 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.Project{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/controllermanager/project/stale/stale_suite_test.go b/test/integration/controllermanager/project/stale/stale_suite_test.go
@@ -118,11 +118,11 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/test/integration/controllermanager/seed/backupbucketscheck/backupbucketscheck_suite_test.go b/test/integration/controllermanager/seed/backupbucketscheck/backupbucketscheck_suite_test.go
@@ -94,7 +94,7 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.BackupBucket{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
@@ -103,7 +103,7 @@ var _ = BeforeSuite(func() {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/controllermanager/seed/extensionscheck/extensionscheck_suite_test.go b/test/integration/controllermanager/seed/extensionscheck/extensionscheck_suite_test.go
@@ -99,7 +99,7 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerInstallation{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
@@ -108,7 +108,7 @@ var _ = BeforeSuite(func() {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/controllermanager/seed/lifecycle/lifecycle_suite_test.go b/test/integration/controllermanager/seed/lifecycle/lifecycle_suite_test.go
@@ -109,11 +109,11 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/test/integration/controllermanager/seed/secrets/secrets_suite_test.go b/test/integration/controllermanager/seed/secrets/secrets_suite_test.go
@@ -103,13 +103,13 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.Seed{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/test/integration/controllermanager/shoot/conditions/conditions_suite_test.go b/test/integration/controllermanager/shoot/conditions/conditions_suite_test.go
@@ -100,11 +100,11 @@ var _ = BeforeSuite(func() {
 		Scheme:             kubernetes.GardenScheme,
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/backupbucket/backupbucket_suite_test.go b/test/integration/gardenlet/backupbucket/backupbucket_suite_test.go
@@ -211,7 +211,7 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.BackupBucket{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
@@ -225,7 +225,7 @@ var _ = BeforeSuite(func() {
 					Field: fields.SelectorFromSet(fields.Set{gardencore.BackupEntrySeedName: seed.Name}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/backupentry/backupentry/backupentry_suite_test.go b/test/integration/gardenlet/backupentry/backupentry/backupentry_suite_test.go
@@ -216,7 +216,7 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.BackupBucket{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
@@ -228,7 +228,7 @@ var _ = BeforeSuite(func() {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/bastion/bastion_suite_test.go b/test/integration/gardenlet/bastion/bastion_suite_test.go
@@ -157,13 +157,13 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			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})},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

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

diff --git a/...denlet/controllerinstallation/controllerinstallation/controllerinstallation_suite_test.go b/...denlet/controllerinstallation/controllerinstallation/controllerinstallation_suite_test.go
@@ -186,7 +186,7 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.ControllerInstallation{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
@@ -202,7 +202,7 @@ var _ = BeforeSuite(func() {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/controllerinstallation/required/required_suite_test.go b/test/integration/gardenlet/controllerinstallation/required/required_suite_test.go
@@ -138,11 +138,11 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/managedseed/managedseed_suite_test.go b/test/integration/gardenlet/managedseed/managedseed_suite_test.go
@@ -181,13 +181,13 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			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})},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/networkpolicy/networkpolicy_suite_test.go b/test/integration/gardenlet/networkpolicy/networkpolicy_suite_test.go
@@ -146,7 +146,7 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&corev1.Namespace{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
@@ -155,7 +155,7 @@ var _ = BeforeSuite(func() {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/test/integration/gardenlet/seed/care/care_suite_test.go b/test/integration/gardenlet/seed/care/care_suite_test.go
@@ -128,13 +128,13 @@ var _ = BeforeSuite(func() {
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
 		Namespace:          testNamespace.Name,
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			ByObject: map[client.Object]cache.ByObject{
 				&gardencorev1beta1.Seed{}: {
 					Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 				},
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/seed/seed/seed_test.go b/test/integration/gardenlet/seed/seed/seed_test.go
@@ -95,7 +95,7 @@ var _ = Describe("Seed controller tests", func() {
 		mgr, err := manager.New(restConfig, manager.Options{
 			Scheme:             testScheme,
 			MetricsBindAddress: "0",
-			NewCache: cache.BuilderWithOptions(cache.Options{
+			Cache: cache.Options{
 				Mapper: mapper,
 				ByObject: map[client.Object]cache.ByObject{
 					&gardencorev1beta1.Seed{}: {
@@ -105,7 +105,7 @@ var _ = Describe("Seed controller tests", func() {
 						Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 					},
 				},
-			}),
+			},
 		})
 		Expect(err).NotTo(HaveOccurred())
 		mgrClient = mgr.GetClient()

diff --git a/test/integration/gardenlet/shoot/care/care_suite_test.go b/test/integration/gardenlet/shoot/care/care_suite_test.go
@@ -231,11 +231,11 @@ var _ = BeforeSuite(func() {
 	mgr, err := manager.New(restConfig, manager.Options{
 		Scheme:             testScheme,
 		MetricsBindAddress: "0",
-		NewCache: cache.BuilderWithOptions(cache.Options{
+		Cache: cache.Options{
 			DefaultSelector: cache.ObjectSelector{
 				Label: labels.SelectorFromSet(labels.Set{testID: testRunID}),
 			},
-		}),
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 	mgrClient = mgr.GetClient()