Actually inject the scheme in StandaloneWebhook

kubernetes-sigs · Apr 23, 2021 · 991366f · 991366f
1 parent d5d2551
commit 991366f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 43 deletions.
diff --git a/pkg/webhook/admission/validator_test.go b/pkg/webhook/admission/validator_test.go
@@ -7,6 +7,7 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission/admissiontest"
 
 	admissionv1 "k8s.io/api/admission/v1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
@@ -16,13 +17,15 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 )
 
+var fakeValidatorVK = schema.GroupVersionKind{Group: "foo.test.org", Version: "v1", Kind: "fakeValidator"}
+
 var _ = Describe("validatingHandler", func() {
 
 	decoder, _ := NewDecoder(scheme.Scheme)
 
 	Context("when dealing with successful results", func() {
 
-		f := &fakeValidator{ErrorToReturn: nil}
+		f := &admissiontest.FakeValidator{ErrorToReturn: nil, GVKToReturn: fakeValidatorVK}
 		handler := validatingHandler{validator: f, decoder: decoder}
 
 		It("should return 200 in response when create succeeds", func() {
@@ -85,7 +88,7 @@ var _ = Describe("validatingHandler", func() {
 				Code:    http.StatusUnprocessableEntity,
 			},
 		}
-		f := &fakeValidator{ErrorToReturn: expectedError}
+		f := &admissiontest.FakeValidator{ErrorToReturn: expectedError, GVKToReturn: fakeValidatorVK}
 		handler := validatingHandler{validator: f, decoder: decoder}
 
 		It("should propagate the Status from ValidateCreate's return value to the HTTP response", func() {
@@ -150,7 +153,7 @@ var _ = Describe("validatingHandler", func() {
 	Context("when dealing with non-status errors", func() {
 
 		expectedError := goerrors.New("some error")
-		f := &fakeValidator{ErrorToReturn: expectedError}
+		f := &admissiontest.FakeValidator{ErrorToReturn: expectedError, GVKToReturn: fakeValidatorVK}
 		handler := validatingHandler{validator: f, decoder: decoder}
 
 		It("should return 403 response when ValidateCreate with error message embedded", func() {
@@ -219,35 +222,3 @@ var _ = Describe("validatingHandler", func() {
 	PIt("should return 400 in response when delete fails on decode", func() {})
 
 })
-
-type fakeValidator struct {
-	ErrorToReturn error `json:"ErrorToReturn,omitempty"`
-}
-
-var _ Validator = &fakeValidator{}
-
-var fakeValidatorVK = schema.GroupVersionKind{Group: "foo.test.org", Version: "v1", Kind: "fakeValidator"}
-
-func (v *fakeValidator) ValidateCreate() error {
-	return v.ErrorToReturn
-}
-
-func (v *fakeValidator) ValidateUpdate(old runtime.Object) error {
-	return v.ErrorToReturn
-}
-
-func (v *fakeValidator) ValidateDelete() error {
-	return v.ErrorToReturn
-}
-
-func (v *fakeValidator) GetObjectKind() schema.ObjectKind { return v }
-
-func (v *fakeValidator) DeepCopyObject() runtime.Object {
-	return &fakeValidator{ErrorToReturn: v.ErrorToReturn}
-}
-
-func (v *fakeValidator) GroupVersionKind() schema.GroupVersionKind {
-	return fakeValidatorVK
-}
-
-func (v *fakeValidator) SetGroupVersionKind(gvk schema.GroupVersionKind) {}
diff --git a/pkg/webhook/admission/webhook.go b/pkg/webhook/admission/webhook.go
@@ -235,9 +235,7 @@ func StandaloneWebhook(hook *Webhook, opts StandaloneOptions) (http.Handler, err
 		opts.Scheme = scheme.Scheme
 	}
 
-	var err error
-	hook.decoder, err = NewDecoder(opts.Scheme)
-	if err != nil {
+	if err := hook.InjectScheme(opts.Scheme); err != nil {
 		return nil, err
 	}
 

diff --git a/pkg/webhook/webhook_integration_test.go b/pkg/webhook/webhook_integration_test.go
@@ -3,6 +3,7 @@ package webhook_test
 import (
 	"context"
 	"crypto/tls"
+	goerrors "errors"
 	"fmt"
 	"net"
 	"net/http"
@@ -16,12 +17,14 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes/scheme"
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission/admissiontest"
 )
 
 var _ = Describe("Webhook", func() {
@@ -111,7 +114,8 @@ var _ = Describe("Webhook", func() {
 	Context("when running a standalone webhook", func() {
 		It("should reject create request for webhook that rejects all requests", func(done Done) {
 			ctx, cancel := context.WithCancel(context.Background())
-			// generate tls cfg
+
+			By("generating the TLS config")
 			certPath := filepath.Join(testenv.WebhookInstallOptions.LocalServingCertDir, "tls.crt")
 			keyPath := filepath.Join(testenv.WebhookInstallOptions.LocalServingCertDir, "tls.key")
 
@@ -126,18 +130,22 @@ var _ = Describe("Webhook", func() {
 				GetCertificate: certWatcher.GetCertificate,
 			}
 
-			// generate listener
+			By("generating the listener")
 			listener, err := tls.Listen("tcp",
 				net.JoinHostPort(testenv.WebhookInstallOptions.LocalServingHost,
 					strconv.Itoa(int(testenv.WebhookInstallOptions.LocalServingPort))), cfg)
 			Expect(err).NotTo(HaveOccurred())
 
-			// create and register the standalone webhook
-			hook, err := admission.StandaloneWebhook(&webhook.Admission{Handler: &rejectingValidator{}}, admission.StandaloneOptions{})
+			By("creating and registering the standalone webhook")
+			hook, err := admission.StandaloneWebhook(admission.ValidatingWebhookFor(
+				&admissiontest.FakeValidator{
+					ErrorToReturn: goerrors.New("Always denied"),
+					GVKToReturn:   schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "Deployment"},
+				}), admission.StandaloneOptions{})
 			Expect(err).NotTo(HaveOccurred())
 			http.Handle("/failing", hook)
 
-			// run the http server
+			By("running the http server")
 			srv := &http.Server{}
 			go func() {
 				idleConnsClosed := make(chan struct{})