diff --git a/test/integration/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go b/test/integration/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go index 9db1e2acf85..eb0d3bf545b 100644 --- a/test/integration/controllermanager/certificatesigningrequest/certificatesigningrequest_suite_test.go +++ b/test/integration/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 index 8ffc0a23e99..485f6bf9247 100644 --- 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 index a3d478aceb0..f3bbed2f76a 100644 --- 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/test/integration/controllermanager/controllerregistration/controllerregistration_suite_test.go b/test/integration/controllermanager/controllerregistration/controllerregistration_suite_test.go index 8d0edaf4679..22252ba3ad8 100644 --- a/test/integration/controllermanager/controllerregistration/controllerregistration_suite_test.go +++ b/test/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 index 472a7e317e0..a3ea1995e5a 100644 --- 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 index c22710dead5..6a45861fd65 100644 --- 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 index 7864db579fb..9f309430028 100644 --- 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 index 3779345372c..d8439b5b951 100644 --- 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 index 62fda373883..18a494ab760 100644 --- 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 index c2b5806f9d6..b5ffcfecc17 100644 --- 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 index c3095453c2a..446cf75fc3c 100644 --- 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 index f519aa06609..429f2885700 100644 --- 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 index 14f398cfd74..d0c9869582f 100644 --- 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 index 71833d12e28..65df6ce268c 100644 --- 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 index 64f80ff5324..52941e828aa 100644 --- 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 index 05cd917c398..4e3ea650acc 100644 --- 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 index fdc806023e4..572e4ddc98e 100644 --- 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 index ecbbbf4d9e7..38519019584 100644 --- 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/test/integration/gardenlet/controllerinstallation/controllerinstallation/controllerinstallation_suite_test.go b/test/integration/gardenlet/controllerinstallation/controllerinstallation/controllerinstallation_suite_test.go index db0dc365f14..5305c87e88e 100644 --- a/test/integration/gardenlet/controllerinstallation/controllerinstallation/controllerinstallation_suite_test.go +++ b/test/integration/gardenlet/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 index 8f363f22826..c5168080cea 100644 --- 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 index 9ce0794b2e2..00188ef4bf4 100644 --- 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 index e6d4aff2afa..2ed53b0de95 100644 --- 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 index f88adc68d0f..e3da8f0dd41 100644 --- 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 index c0c68d3a66e..56f5d2a3e96 100644 --- 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 index d0f0880fcf2..d387d181870 100644 --- 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() diff --git a/test/integration/gardenlet/shootstate/extensions/extensions_suite_test.go b/test/integration/gardenlet/shootstate/extensions/extensions_suite_test.go index 26e74650551..7c2f1ab1b05 100644 --- a/test/integration/gardenlet/shootstate/extensions/extensions_suite_test.go +++ b/test/integration/gardenlet/shootstate/extensions/extensions_suite_test.go @@ -110,11 +110,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() diff --git a/test/integration/gardenlet/shootstate/secret/secret_suite_test.go b/test/integration/gardenlet/shootstate/secret/secret_suite_test.go index 2d4982c1d88..f0c9f59b26a 100644 --- a/test/integration/gardenlet/shootstate/secret/secret_suite_test.go +++ b/test/integration/gardenlet/shootstate/secret/secret_suite_test.go @@ -131,11 +131,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() diff --git a/test/integration/operator/garden/garden_test.go b/test/integration/operator/garden/garden_test.go index 4e64b57c2fc..6a7dd43349e 100644 --- a/test/integration/operator/garden/garden_test.go +++ b/test/integration/operator/garden/garden_test.go @@ -116,14 +116,14 @@ var _ = Describe("Garden controller tests", func() { mgr, err := manager.New(restConfig, manager.Options{ Scheme: operatorclient.RuntimeScheme, MetricsBindAddress: "0", - NewCache: cache.BuilderWithOptions(cache.Options{ + Cache: cache.Options{ Mapper: mapper, ByObject: map[client.Object]cache.ByObject{ &operatorv1alpha1.Garden{}: { Label: labels.SelectorFromSet(labels.Set{testID: testRunID}), }, }, - }), + }, }) Expect(err).NotTo(HaveOccurred()) mgrClient = mgr.GetClient() diff --git a/test/integration/resourcemanager/csrapprover/csrapprover_suite_test.go b/test/integration/resourcemanager/csrapprover/csrapprover_suite_test.go index c97cb03e71a..06f4e421985 100644 --- a/test/integration/resourcemanager/csrapprover/csrapprover_suite_test.go +++ b/test/integration/resourcemanager/csrapprover/csrapprover_suite_test.go @@ -131,11 +131,11 @@ var _ = BeforeSuite(func() { Scheme: resourcemanagerclient.CombinedScheme, 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/resourcemanager/node/node_suite_test.go b/test/integration/resourcemanager/node/node_suite_test.go index aaad3131ea5..93d5d9625ed 100644 --- a/test/integration/resourcemanager/node/node_suite_test.go +++ b/test/integration/resourcemanager/node/node_suite_test.go @@ -103,13 +103,13 @@ var _ = BeforeSuite(func() { mgr, err := manager.New(restConfig, manager.Options{ MetricsBindAddress: "0", Namespace: testNamespace.Name, - NewCache: cache.BuilderWithOptions(cache.Options{ + Cache: cache.Options{ ByObject: map[client.Object]cache.ByObject{ &corev1.Node{}: { Label: labels.SelectorFromSet(labels.Set{testID: testRunID}), }, }, - }), + }, }) Expect(err).NotTo(HaveOccurred()) mgrClient = mgr.GetClient()