remove webhook injections

elastic · May 30, 2023 · 2d31fe0 · 2d31fe0
1 parent cdb91cd
commit 2d31fe0
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 14 deletions.
diff --git a/pkg/controller/autoscaling/elasticsearch/validation/webhook.go b/pkg/controller/autoscaling/elasticsearch/validation/webhook.go
@@ -51,8 +51,6 @@ type validatingWebhook struct {
 	managedNamespaces    set.StringSet
 }
 
-var _ admission.DecoderInjector = &validatingWebhook{}
-
 // InjectDecoder injects the decoder automatically.
 func (wh *validatingWebhook) InjectDecoder(d *admission.Decoder) error {
 	wh.decoder = d

diff --git a/pkg/controller/common/webhook/webhook.go b/pkg/controller/common/webhook/webhook.go
@@ -58,8 +58,6 @@ type validatingWebhook struct {
 	validator         admission.Validator
 }
 
-var _ admission.DecoderInjector = &validatingWebhook{}
-
 // InjectDecoder injects the decoder automatically.
 func (v *validatingWebhook) InjectDecoder(d *admission.Decoder) error {
 	v.decoder = d

diff --git a/pkg/controller/common/webhook/webhook_test.go b/pkg/controller/common/webhook/webhook_test.go
@@ -276,7 +276,7 @@ func Test_validatingWebhook_Handle(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.Background()
-			decoder, _ := admission.NewDecoder(k8s.Scheme())
+			decoder := admission.NewDecoder(k8s.Scheme())
 			v := &validatingWebhook{
 				decoder:           decoder,
 				managedNamespaces: tt.fields.managedNamespaces,

diff --git a/pkg/controller/elasticsearch/validation/webhook.go b/pkg/controller/elasticsearch/validation/webhook.go
@@ -53,8 +53,6 @@ type validatingWebhook struct {
 	managedNamespaces    set.StringSet
 }
 
-var _ admission.DecoderInjector = &validatingWebhook{}
-
 // InjectDecoder injects the decoder automatically.
 func (wh *validatingWebhook) InjectDecoder(d *admission.Decoder) error {
 	wh.decoder = d

diff --git a/pkg/controller/elasticsearch/validation/webhook_test.go b/pkg/controller/elasticsearch/validation/webhook_test.go
@@ -29,7 +29,7 @@ func asJSON(obj interface{}) []byte {
 }
 
 func Test_validatingWebhook_Handle(t *testing.T) {
-	decoder, _ := admission.NewDecoder(k8s.Scheme())
+	decoder := admission.NewDecoder(k8s.Scheme())
 	type fields struct {
 		client               k8s.Client
 		validateStorageClass bool

diff --git a/pkg/utils/test/webhook.go b/pkg/utils/test/webhook.go
@@ -26,11 +26,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	controllerscheme "github.com/elastic/cloud-on-k8s/v2/pkg/controller/common/scheme"
-	ulog "github.com/elastic/cloud-on-k8s/v2/pkg/utils/log"
 )
 
-var log = ulog.Log.WithName("test-webhook")
-
 // ValidationWebhookTestCase represents a test case for testing a validation webhook
 type ValidationWebhookTestCase struct {
 	Name      string                                                           // Name of the test
@@ -82,9 +79,7 @@ func RunValidationWebhookTests(t *testing.T, gvk metav1.GroupVersionKind, valida
 	controllerscheme.SetupScheme()
 	decoder := serializer.NewCodecFactory(clientgoscheme.Scheme).UniversalDeserializer()
 
-	webhook := admission.ValidatingWebhookFor(validator)
-	require.NoError(t, webhook.InjectScheme(clientgoscheme.Scheme))
-	require.NoError(t, webhook.InjectLogger(log))
+	webhook := admission.ValidatingWebhookFor(clientgoscheme.Scheme, validator)
 
 	server := httptest.NewServer(webhook)
 	defer server.Close()