diff --git a/extensions/pkg/util/shoot_test.go b/extensions/pkg/util/shoot_test.go index a75475ec2e8..5b2b9e7383b 100644 --- a/extensions/pkg/util/shoot_test.go +++ b/extensions/pkg/util/shoot_test.go @@ -98,7 +98,7 @@ var _ = Describe("Shoot", func() { MaxTimes(2) c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})). - DoAndReturn(func(_ context.Context, _ *corev1.Secret) error { + DoAndReturn(func(_ context.Context, _ *corev1.Secret, _ ...client.CreateOption) error { return nil }) @@ -159,7 +159,7 @@ var _ = Describe("Shoot", func() { MaxTimes(2) c.EXPECT().Update(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})). - DoAndReturn(func(_ context.Context, _ *corev1.Secret) error { + DoAndReturn(func(_ context.Context, _ *corev1.Secret, _ ...client.UpdateOption) error { return nil }) diff --git a/pkg/admissioncontroller/webhooks/admission/internaldomainsecret/admission_test.go b/pkg/admissioncontroller/webhooks/admission/internaldomainsecret/admission_test.go index 42a361ba73a..c19cca662db 100644 --- a/pkg/admissioncontroller/webhooks/admission/internaldomainsecret/admission_test.go +++ b/pkg/admissioncontroller/webhooks/admission/internaldomainsecret/admission_test.go @@ -162,7 +162,7 @@ var _ = Describe("handler", func() { client.InNamespace(gardenNamespaceName), client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleInternalDomain}, client.Limit(1), - ).DoAndReturn(func(_ context.Context, list client.ObjectList, inNamespace, internalDomainLabels, limitOne client.ListOption) error { + ).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error { (&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList)) return nil }) @@ -182,7 +182,7 @@ var _ = Describe("handler", func() { client.InNamespace(seedNamespace), client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleInternalDomain}, client.Limit(1), - ).DoAndReturn(func(_ context.Context, list client.ObjectList, inNamespace, internalDomainLabels, limitOne client.ListOption) error { + ).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error { (&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList)) return nil }) @@ -387,7 +387,7 @@ var _ = Describe("handler", func() { gomock.AssignableToTypeOf(&metav1.PartialObjectMetadataList{}), client.Limit(1), client.MatchingFields{gardenercore.ShootSeedName: seedName}, - ).DoAndReturn(func(_ context.Context, list client.ObjectList, limitOne, seedNameSelector client.ListOption) error { + ).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error { (&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList)) return nil }) @@ -474,7 +474,7 @@ var _ = Describe("handler", func() { gomock.AssignableToTypeOf(&metav1.PartialObjectMetadataList{}), client.Limit(1), client.MatchingFields{gardenercore.ShootSeedName: seedName}, - ).DoAndReturn(func(_ context.Context, list client.ObjectList, limitOne, seedNameSelector client.ListOption) error { + ).DoAndReturn(func(_ context.Context, list client.ObjectList, _ ...client.ListOption) error { (&metav1.PartialObjectMetadataList{Items: []metav1.PartialObjectMetadata{{}}}).DeepCopyInto(list.(*metav1.PartialObjectMetadataList)) return nil }) diff --git a/pkg/controllermanager/controller/managedseedset/managedseedset_reconciler_test.go b/pkg/controllermanager/controller/managedseedset/managedseedset_reconciler_test.go index 26c2d56bfe9..d963386407e 100644 --- a/pkg/controllermanager/controller/managedseedset/managedseedset_reconciler_test.go +++ b/pkg/controllermanager/controller/managedseedset/managedseedset_reconciler_test.go @@ -107,7 +107,7 @@ var _ = Describe("Reconciler", func() { } expectPatchManagedSeedSet = func(expect func(*seedmanagementv1alpha1.ManagedSeedSet)) { c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeedSet{}), gomock.Any()).DoAndReturn( - func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch) error { + func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch, _ ...client.PatchOption) error { expect(mss) *set = *mss return nil @@ -116,7 +116,7 @@ var _ = Describe("Reconciler", func() { } expectPatchManagedSeedSetStatus = func(expect func(*seedmanagementv1alpha1.ManagedSeedSet)) { sw.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeedSet{}), gomock.Any()).DoAndReturn( - func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch) error { + func(_ context.Context, mss *seedmanagementv1alpha1.ManagedSeedSet, _ client.Patch, _ ...client.PatchOption) error { expect(mss) *set = *mss return nil diff --git a/pkg/controllermanager/controller/managedseedset/managedseedset_replica_test.go b/pkg/controllermanager/controller/managedseedset/managedseedset_replica_test.go index 1a2c1db5cdc..7523668ec48 100644 --- a/pkg/controllermanager/controller/managedseedset/managedseedset_replica_test.go +++ b/pkg/controllermanager/controller/managedseedset/managedseedset_replica_test.go @@ -303,7 +303,7 @@ var _ = Describe("Replica", func() { Describe("#CreateShoot", func() { It("should create the shoot", func() { c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{})).DoAndReturn( - func(_ context.Context, s *gardencorev1beta1.Shoot) error { + func(_ context.Context, s *gardencorev1beta1.Shoot, _ ...client.CreateOption) error { Expect(s).To(Equal(&gardencorev1beta1.Shoot{ ObjectMeta: metav1.ObjectMeta{ Name: replicaName, @@ -335,7 +335,7 @@ var _ = Describe("Replica", func() { It("should create the managed seed", func() { shoot := shoot(nil, "", "", "", false) c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.CreateOption) error { Expect(ms).To(Equal(&seedmanagementv1alpha1.ManagedSeed{ ObjectMeta: metav1.ObjectMeta{ Name: replicaName, @@ -382,14 +382,14 @@ var _ = Describe("Replica", func() { It("should clean the retries, confirm the deletion, and delete the shoot", func() { shoot := shoot(nil, "", "", "", false) c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { Expect(s.Annotations).To(HaveKeyWithValue(gutil.ConfirmationDeletion, "true")) *shoot = *s return nil }, ) c.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{})).DoAndReturn( - func(_ context.Context, s *gardencorev1beta1.Shoot) error { + func(_ context.Context, s *gardencorev1beta1.Shoot, _ ...client.DeleteOption) error { Expect(s).To(Equal(shoot)) return nil }, @@ -405,7 +405,7 @@ var _ = Describe("Replica", func() { It("should delete the managed seed", func() { managedSeed := managedSeed(nil, false, false) c.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.DeleteOption) error { Expect(ms).To(Equal(managedSeed)) return nil }, @@ -421,7 +421,7 @@ var _ = Describe("Replica", func() { It("should set the operation to retry and the retries to 1", func() { shoot := shoot(nil, "", "", "", false) c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, s *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { Expect(s.Annotations).To(HaveKeyWithValue(v1beta1constants.GardenerOperation, v1beta1constants.ShootOperationRetry)) return nil }, diff --git a/pkg/controllermanager/controller/seed/seed_backup_bucket_reconcile_test.go b/pkg/controllermanager/controller/seed/seed_backup_bucket_reconcile_test.go index 6a97bb3f0fb..d43c71bf9fd 100644 --- a/pkg/controllermanager/controller/seed/seed_backup_bucket_reconcile_test.go +++ b/pkg/controllermanager/controller/seed/seed_backup_bucket_reconcile_test.go @@ -81,7 +81,7 @@ var _ = Describe("BackupBucketReconciler", func() { JustBeforeEach(func() { sw.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(seed), gomock.Any()).DoAndReturn( - func(_ context.Context, obj client.Object, patch client.Patch) error { + func(_ context.Context, obj client.Object, patch client.Patch, _ ...client.PatchOption) error { patchData, err := patch.Data(obj) Expect(err).NotTo(HaveOccurred()) Expect(json.Unmarshal(patchData, seedPatch)).To(Succeed()) diff --git a/pkg/controllermanager/controller/shoot/shoot_reference_control_test.go b/pkg/controllermanager/controller/shoot/shoot_reference_control_test.go index 993883805d5..327e8ec3e0f 100644 --- a/pkg/controllermanager/controller/shoot/shoot_reference_control_test.go +++ b/pkg/controllermanager/controller/shoot/shoot_reference_control_test.go @@ -246,14 +246,14 @@ var _ = Describe("Shoot References", func() { return nil }) cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn( - func(_ context.Context, secret *corev1.Secret, _ client.Patch) error { + func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error { defer m.Unlock() m.Lock() updatedSecrets = append(updatedSecrets, secret) return nil }) cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn( - func(_ context.Context, secret *corev1.Secret, _ client.Patch) error { + func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error { defer m.Unlock() m.Lock() updatedSecrets = append(updatedSecrets, secret) @@ -262,7 +262,7 @@ var _ = Describe("Shoot References", func() { var updatedShoot *gardencorev1beta1.Shoot cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -330,14 +330,14 @@ var _ = Describe("Shoot References", func() { return nil }) cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn( - func(_ context.Context, secret *corev1.Secret, _ client.Patch) error { + func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error { updatedSecret = secret return nil }) var updatedShoot *gardencorev1beta1.Shoot cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -400,7 +400,7 @@ var _ = Describe("Shoot References", func() { var updatedShoot *gardencorev1beta1.Shoot cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -455,7 +455,7 @@ var _ = Describe("Shoot References", func() { var updatedSecret *corev1.Secret cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.Secret{}), gomock.Any()).DoAndReturn( - func(_ context.Context, secret *corev1.Secret, _ client.Patch) error { + func(_ context.Context, secret *corev1.Secret, _ client.Patch, _ ...client.PatchOption) error { updatedSecret = secret return nil }) @@ -566,14 +566,14 @@ var _ = Describe("Shoot References", func() { var updatedConfigMap *corev1.ConfigMap cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn( - func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch) error { + func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error { updatedConfigMap = configMap return nil }) var updatedShoot *gardencorev1beta1.Shoot cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -637,14 +637,14 @@ var _ = Describe("Shoot References", func() { return nil }) cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn( - func(_ context.Context, cm *corev1.ConfigMap, _ client.Patch) error { + func(_ context.Context, cm *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error { updatedConfigMap = cm return nil }) var updatedShoot *gardencorev1beta1.Shoot cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -711,7 +711,7 @@ var _ = Describe("Shoot References", func() { var updatedShoot *gardencorev1beta1.Shoot cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -768,7 +768,7 @@ var _ = Describe("Shoot References", func() { var updatedConfigMap *corev1.ConfigMap cl.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&corev1.ConfigMap{}), gomock.Any()).DoAndReturn( - func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch) error { + func(_ context.Context, configMap *corev1.ConfigMap, _ client.Patch, _ ...client.PatchOption) error { updatedConfigMap = configMap return nil }) diff --git a/pkg/gardenlet/bootstrap/util/util_test.go b/pkg/gardenlet/bootstrap/util/util_test.go index b2504f58a2c..978ed670cb1 100644 --- a/pkg/gardenlet/bootstrap/util/util_test.go +++ b/pkg/gardenlet/bootstrap/util/util_test.go @@ -201,7 +201,7 @@ var _ = Describe("Util", func() { }) c.EXPECT().Get(ctx, kutil.Key(metav1.NamespaceSystem, bootstrapTokenSecretName), gomock.AssignableToTypeOf(&corev1.Secret{})).Return(nil).Times(2) - c.EXPECT().Update(ctx, gomock.Any()).DoAndReturn(func(_ context.Context, s *corev1.Secret) error { + c.EXPECT().Update(ctx, gomock.Any()).DoAndReturn(func(_ context.Context, s *corev1.Secret, _ ...client.UpdateOption) error { Expect(s.Name).To(Equal(bootstrapTokenSecretName)) Expect(s.Namespace).To(Equal(metav1.NamespaceSystem)) Expect(s.Type).To(Equal(bootstraptokenapi.SecretTypeBootstrapToken)) @@ -255,7 +255,7 @@ var _ = Describe("Util", func() { ) It("should fail because the service account token controller has not yet created a secret for the service account", func() { - c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount) error { + c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount, _ ...client.CreateOption) error { s.Name = serviceAccountName s.Namespace = "garden" s.Secrets = []corev1.ObjectReference{} @@ -269,7 +269,7 @@ var _ = Describe("Util", func() { It("should succeed", func() { // create service account - c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount) error { + c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.ServiceAccount{})).DoAndReturn(func(_ context.Context, s *corev1.ServiceAccount, _ ...client.CreateOption) error { Expect(s.Name).To(Equal(serviceAccountName)) Expect(s.Namespace).To(Equal("garden")) s.Secrets = []corev1.ObjectReference{ @@ -294,7 +294,7 @@ var _ = Describe("Util", func() { Name: fmt.Sprintf("gardener.cloud:system:seed-bootstrapper:%s:%s", serviceAccountNamespace, serviceAccountName), }, } - c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&rbacv1.ClusterRoleBinding{})).DoAndReturn(func(_ context.Context, s *rbacv1.ClusterRoleBinding) error { + c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&rbacv1.ClusterRoleBinding{})).DoAndReturn(func(_ context.Context, s *rbacv1.ClusterRoleBinding, _ ...client.CreateOption) error { expectedClusterRoleBinding := clusterRoleBinding expectedClusterRoleBinding.RoleRef = rbacv1.RoleRef{ APIGroup: "rbac.authorization.k8s.io", diff --git a/pkg/gardenlet/controller/managedseed/managedseed_actuator_test.go b/pkg/gardenlet/controller/managedseed/managedseed_actuator_test.go index e2d4d944191..538c0c944f9 100644 --- a/pkg/gardenlet/controller/managedseed/managedseed_actuator_test.go +++ b/pkg/gardenlet/controller/managedseed/managedseed_actuator_test.go @@ -309,7 +309,7 @@ var _ = Describe("Actuator", func() { }, ) shc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Namespace{})).DoAndReturn( - func(_ context.Context, ns *corev1.Namespace) error { + func(_ context.Context, ns *corev1.Namespace, _ ...client.CreateOption) error { Expect(ns.Name).To(Equal(v1beta1constants.GardenNamespace)) return nil }, @@ -318,7 +318,7 @@ var _ = Describe("Actuator", func() { expectDeleteGardenNamespace = func() { shc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Namespace{})).DoAndReturn( - func(_ context.Context, ns *corev1.Namespace) error { + func(_ context.Context, ns *corev1.Namespace, _ ...client.DeleteOption) error { Expect(ns.Name).To(Equal(v1beta1constants.GardenNamespace)) return nil }, @@ -375,7 +375,7 @@ var _ = Describe("Actuator", func() { }, ) gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn( - func(_ context.Context, s *corev1.Secret) error { + func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error { Expect(s).To(Equal(backupSecret)) return nil }, @@ -389,7 +389,7 @@ var _ = Describe("Actuator", func() { }, ) gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn( - func(_ context.Context, s *corev1.Secret) error { + func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error { Expect(s).To(Equal(seedSecret)) return nil }, @@ -405,7 +405,7 @@ var _ = Describe("Actuator", func() { }, ) gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn( - func(_ context.Context, s *corev1.Secret) error { + func(_ context.Context, s *corev1.Secret, _ ...client.DeleteOption) error { Expect(s.Name).To(Equal(backupSecretName)) Expect(s.Namespace).To(Equal(namespace)) return nil @@ -414,7 +414,7 @@ var _ = Describe("Actuator", func() { // Delete seed secret gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn( - func(_ context.Context, s *corev1.Secret) error { + func(_ context.Context, s *corev1.Secret, _ ...client.DeleteOption) error { Expect(s.Name).To(Equal(seedSecretName)) Expect(s.Namespace).To(Equal(namespace)) return nil @@ -448,7 +448,7 @@ var _ = Describe("Actuator", func() { expectCreateSeed = func() { gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Seed{})).DoAndReturn( - func(_ context.Context, s *gardencorev1beta1.Seed) error { + func(_ context.Context, s *gardencorev1beta1.Seed, _ ...client.CreateOption) error { Expect(s).To(Equal(seed)) return nil }, @@ -457,7 +457,7 @@ var _ = Describe("Actuator", func() { expectDeleteSeed = func() { gc.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&gardencorev1beta1.Seed{})).DoAndReturn( - func(_ context.Context, s *gardencorev1beta1.Seed) error { + func(_ context.Context, s *gardencorev1beta1.Seed, _ ...client.DeleteOption) error { Expect(s.Name).To(Equal(name)) return nil }, @@ -511,7 +511,7 @@ var _ = Describe("Actuator", func() { }, ).Times(3) gc.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&corev1.Secret{})).DoAndReturn( - func(_ context.Context, s *corev1.Secret) error { + func(_ context.Context, s *corev1.Secret, _ ...client.CreateOption) error { Expect(s.Name).To(Equal("bootstrap-token-a82f8a")) Expect(s.Namespace).To(Equal(metav1.NamespaceSystem)) Expect(s.Type).To(Equal(corev1.SecretTypeBootstrapToken)) diff --git a/pkg/gardenlet/controller/managedseed/managedseed_reconciler_test.go b/pkg/gardenlet/controller/managedseed/managedseed_reconciler_test.go index 01fe83dce4e..32cca77cf0a 100644 --- a/pkg/gardenlet/controller/managedseed/managedseed_reconciler_test.go +++ b/pkg/gardenlet/controller/managedseed/managedseed_reconciler_test.go @@ -116,7 +116,7 @@ var _ = Describe("Reconciler", func() { } expectPatchManagedSeed = func(expect func(*seedmanagementv1alpha1.ManagedSeed)) { c.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{}), gomock.Any()).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ client.Patch) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ client.Patch, _ ...client.PatchOption) error { expect(ms) *managedSeed = *ms return nil @@ -125,7 +125,7 @@ var _ = Describe("Reconciler", func() { } expectPatchManagedSeedStatus = func(expect func(*seedmanagementv1alpha1.ManagedSeed)) { sw.EXPECT().Patch(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{}), gomock.Any()).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ client.Patch) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ client.Patch, _ ...client.PatchOption) error { expect(ms) *managedSeed = *ms return nil diff --git a/pkg/gardenlet/controller/shoot/seed_registration_control_test.go b/pkg/gardenlet/controller/shoot/seed_registration_control_test.go index b428640e4fe..03df205030f 100644 --- a/pkg/gardenlet/controller/shoot/seed_registration_control_test.go +++ b/pkg/gardenlet/controller/shoot/seed_registration_control_test.go @@ -120,7 +120,7 @@ var _ = Describe("DefaultSeedRegistrationControl", func() { }, ).Times(2) c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.CreateOption) error { Expect(ms).To(Equal(&seedmanagementv1alpha1.ManagedSeed{ ObjectMeta: metav1.ObjectMeta{ Name: name, @@ -178,7 +178,7 @@ var _ = Describe("DefaultSeedRegistrationControl", func() { }, ).Times(2) c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.CreateOption) error { Expect(ms).To(Equal(&seedmanagementv1alpha1.ManagedSeed{ ObjectMeta: metav1.ObjectMeta{ Name: name, @@ -264,7 +264,7 @@ var _ = Describe("DefaultSeedRegistrationControl", func() { }, ).Times(2) c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.CreateOption) error { Expect(ms).To(Equal(&seedmanagementv1alpha1.ManagedSeed{ ObjectMeta: metav1.ObjectMeta{ Name: name, @@ -335,7 +335,7 @@ var _ = Describe("DefaultSeedRegistrationControl", func() { }, ).Times(2) c.EXPECT().Create(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.CreateOption) error { Expect(ms).To(Equal(&seedmanagementv1alpha1.ManagedSeed{ ObjectMeta: metav1.ObjectMeta{ Name: name, @@ -452,7 +452,7 @@ var _ = Describe("DefaultSeedRegistrationControl", func() { }, ) c.EXPECT().Delete(ctx, gomock.AssignableToTypeOf(&seedmanagementv1alpha1.ManagedSeed{})).DoAndReturn( - func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed) error { + func(_ context.Context, ms *seedmanagementv1alpha1.ManagedSeed, _ ...client.DeleteOption) error { Expect(ms.Name).To(Equal(name)) Expect(ms.Namespace).To(Equal(namespace)) return nil diff --git a/pkg/gardenlet/controller/shoot/shoot_care_control_test.go b/pkg/gardenlet/controller/shoot/shoot_care_control_test.go index 1156da3c88a..538de349597 100644 --- a/pkg/gardenlet/controller/shoot/shoot_care_control_test.go +++ b/pkg/gardenlet/controller/shoot/shoot_care_control_test.go @@ -323,7 +323,7 @@ var _ = Describe("Shoot Care Control", func() { It("should not set conditions / constraints", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -352,7 +352,7 @@ var _ = Describe("Shoot Care Control", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -390,7 +390,7 @@ var _ = Describe("Shoot Care Control", func() { It("should not set conditions / constraints", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -418,7 +418,7 @@ var _ = Describe("Shoot Care Control", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -538,7 +538,7 @@ var _ = Describe("Shoot Care Control", func() { It("should merge shoot and seed conditions", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -570,7 +570,7 @@ var _ = Describe("Shoot Care Control", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -593,7 +593,7 @@ var _ = Describe("Shoot Care Control", func() { It("should set shoot to unhealthy", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) @@ -682,7 +682,7 @@ var _ = Describe("Shoot Care Control", func() { It("should set shoot to healthy", func() { var updatedShoot *gardencorev1beta1.Shoot gardenClient.EXPECT().Patch(gomock.Any(), gomock.AssignableToTypeOf(&gardencorev1beta1.Shoot{}), gomock.Any()).DoAndReturn( - func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch) error { + func(_ context.Context, shoot *gardencorev1beta1.Shoot, _ client.Patch, _ ...client.PatchOption) error { updatedShoot = shoot return nil }) diff --git a/pkg/operation/seed/seed_test.go b/pkg/operation/seed/seed_test.go index cb8badee2e1..e841a79835d 100644 --- a/pkg/operation/seed/seed_test.go +++ b/pkg/operation/seed/seed_test.go @@ -62,7 +62,7 @@ var _ = Describe("seed", func() { }, } runtimeClient.EXPECT().List(context.TODO(), gomock.AssignableToTypeOf(&corev1.SecretList{}), client.InNamespace(v1beta1constants.GardenNamespace), client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleControlPlaneWildcardCert}).DoAndReturn( - func(_ context.Context, secrets *corev1.SecretList, _ client.ListOption, _ client.ListOption) error { + func(_ context.Context, secrets *corev1.SecretList, _ ...client.ListOption) error { *secrets = *secretList return nil }) @@ -81,7 +81,7 @@ var _ = Describe("seed", func() { }, } runtimeClient.EXPECT().List(context.TODO(), gomock.AssignableToTypeOf(&corev1.SecretList{}), client.InNamespace(v1beta1constants.GardenNamespace), client.MatchingLabels{v1beta1constants.GardenRole: v1beta1constants.GardenRoleControlPlaneWildcardCert}).DoAndReturn( - func(_ context.Context, secrets *corev1.SecretList, _ client.ListOption, _ client.ListOption) error { + func(_ context.Context, secrets *corev1.SecretList, _ ...client.ListOption) error { *secrets = *secretList return nil }) diff --git a/pkg/scheduler/controller/shoot/scheduler_control_test.go b/pkg/scheduler/controller/shoot/scheduler_control_test.go index fe1fb6446a1..0056c016bdb 100644 --- a/pkg/scheduler/controller/shoot/scheduler_control_test.go +++ b/pkg/scheduler/controller/shoot/scheduler_control_test.go @@ -1033,7 +1033,7 @@ var _ = Describe("Scheduler_Control", func() { var runtimeClient = mockclient.NewMockClient(ctrl) shoot.Spec.SeedName = &seed.Name - runtimeClient.EXPECT().Update(context.TODO(), shoot).DoAndReturn(func(_ context.Context, _ client.Object) error { + runtimeClient.EXPECT().Update(context.TODO(), shoot).DoAndReturn(func(_ context.Context, _ client.Object, _ ...client.UpdateOption) error { return nil })