test: update

Signed-off-by: Mike Beaumont <[email protected]>
kumahq · May 22, 2023 · 4c85e3d · 4c85e3d
1 parent e26ffe8
commit 4c85e3d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/pkg/plugins/runtime/k8s/controllers/configmap_controller_test.go b/pkg/plugins/runtime/k8s/controllers/configmap_controller_test.go
@@ -24,7 +24,7 @@ var _ = Describe("DataplaneToMeshMapper", func() {
 	It("should map ingress to list of meshes", func() {
 		l := log.NewLogger(log.InfoLevel)
 		mapper := controllers.DataplaneToMeshMapper(l, "ns", k8s.NewSimpleConverter())
-		requests := mapper(&mesh_k8s.Dataplane{
+		requests := mapper(context.Background(), &mesh_k8s.Dataplane{
 			Mesh: "mesh-1",
 			Spec: mesh_k8s.ToSpec(&mesh_proto.Dataplane{
 				Networking: &mesh_proto.Dataplane_Networking{
@@ -102,7 +102,7 @@ var _ = Describe("ServiceToConfigMapMapper", func() {
 				Expect(k8sClient.Create(ctx, &pod)).To(Succeed())
 			}
 			mapper := controllers.ServiceToConfigMapsMapper(k8sClient, l, "ns")
-			requests := mapper(&givenService)
+			requests := mapper(context.Background(), &givenService)
 			requestsStr := []string{}
 			for _, r := range requests {
 				requestsStr = append(requestsStr, r.Name)

diff --git a/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go b/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go
@@ -648,7 +648,7 @@ var _ = Describe("PodReconciler", func() {
 				},
 			}),
 		}
-		requests := mapper(es)
+		requests := mapper(context.Background(), es)
 		requestsStr := []string{}
 		for _, r := range requests {
 			requestsStr = append(requestsStr, r.Name)

diff --git a/pkg/plugins/runtime/k8s/webhooks/defaulter_test.go b/pkg/plugins/runtime/k8s/webhooks/defaulter_test.go
@@ -57,8 +57,7 @@ var _ = Describe("Defaulter", func() {
 	var handler *kube_admission.Webhook
 
 	BeforeEach(func() {
-		handler = DefaultingWebhookFor(converter)
-		Expect(handler.InjectScheme(scheme)).To(Succeed())
+		handler = DefaultingWebhookFor(scheme, converter)
 	})
 
 	type testCase struct {

diff --git a/pkg/plugins/runtime/k8s/webhooks/service_validator_test.go b/pkg/plugins/runtime/k8s/webhooks/service_validator_test.go
@@ -22,7 +22,7 @@ var _ = Describe("ServiceValidator", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		// when
-		decoder, err = kube_admission.NewDecoder(scheme)
+		decoder = kube_admission.NewDecoder(scheme)
 		// then
 		Expect(err).ToNot(HaveOccurred())
 	})
@@ -34,17 +34,12 @@ var _ = Describe("ServiceValidator", func() {
 
 	DescribeTable("should make a proper admission verdict",
 		func(given testCase) {
-			// setup
-			validator := &ServiceValidator{}
-			// when
-			err := validator.InjectDecoder(decoder)
-			// then
-			Expect(err).ToNot(HaveOccurred())
+			validator := &ServiceValidator{Decoder: decoder}
 
 			// setup
 			admissionReview := admissionv1.AdmissionReview{}
 			// when
-			err = yaml.Unmarshal([]byte(given.request), &admissionReview)
+			err := yaml.Unmarshal([]byte(given.request), &admissionReview)
 			// then
 			Expect(err).ToNot(HaveOccurred())
 

diff --git a/pkg/plugins/runtime/k8s/webhooks/validation_test.go b/pkg/plugins/runtime/k8s/webhooks/validation_test.go
@@ -42,10 +42,11 @@ var _ = Describe("Validation", func() {
 		func(given testCase) {
 			// given
 			allowedUsers := []string{"system:serviceaccount:kube-system:generic-garbage-collector", "system:serviceaccount:kuma-system:kuma-control-plane"}
+			handler := webhooks.NewValidatingWebhook(converter, core_registry.Global(), k8s_registry.Global(), given.mode, allowedUsers)
+			handler.InjectDecoder(kube_admission.NewDecoder(scheme))
 			webhook := &kube_admission.Webhook{
-				Handler: webhooks.NewValidatingWebhook(converter, core_registry.Global(), k8s_registry.Global(), given.mode, allowedUsers),
+				Handler: handler,
 			}
-			Expect(webhook.InjectScheme(scheme)).To(Succeed())
 
 			obj, err := k8s_registry.Global().NewObject(given.objTemplate)
 			Expect(err).ToNot(HaveOccurred())

diff --git a/pkg/plugins/runtime/k8s/webhooks/webhook_suite_test.go b/pkg/plugins/runtime/k8s/webhooks/webhook_suite_test.go
@@ -45,8 +45,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).ToNot(HaveOccurred())
 	Expect(mesh_k8s.AddToScheme(scheme)).To(Succeed())
 
-	decoder, err = kube_admission.NewDecoder(scheme)
-	Expect(err).ToNot(HaveOccurred())
+	decoder = kube_admission.NewDecoder(scheme)
 
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
 	Expect(err).ToNot(HaveOccurred())