Remove the extraneous name field from webhooks

It was only being used for registering metrics, and that can be done
with the path instead.

Author: DirectXMan12

pkg/webhook/admission/http.go

@@ -49,7 +49,7 @@ var _ http.Handler = &Webhook{}
 
 func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	startTS := time.Now()
-	defer metrics.RequestLatency.WithLabelValues(wh.Name).Observe(time.Now().Sub(startTS).Seconds())
+	defer metrics.RequestLatency.WithLabelValues(wh.Path).Observe(time.Now().Sub(startTS).Seconds())
 
 	var body []byte
 	var err error
@@ -100,9 +100,9 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (wh *Webhook) writeResponse(w io.Writer, response Response) {
 	if response.Result.Code != 0 {
 		if response.Result.Code == http.StatusOK {
-			metrics.TotalRequests.WithLabelValues(wh.Name, "true").Inc()
+			metrics.TotalRequests.WithLabelValues(wh.Path, "true").Inc()
 		} else {
-			metrics.TotalRequests.WithLabelValues(wh.Name, "false").Inc()
+			metrics.TotalRequests.WithLabelValues(wh.Path, "false").Inc()
 		}
 	}
 

pkg/webhook/admission/webhook.go

@@ -20,9 +20,6 @@ import (
 	"context"
 	"errors"
 	"net/http"
-	"regexp"
-	"strings"
-	"sync"
 
 	"github.com/appscode/jsonpatch"
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
@@ -108,23 +105,11 @@ func (f HandlerFunc) Handle(ctx context.Context, req Request) Response {
 
 // Webhook represents each individual webhook.
 type Webhook struct {
-	// Name is the name of the webhook
-	Name string
 	// Path is the path this webhook will serve.
 	Path string
 	// Handler actually processes an admission request returning whether it was allowed or denied,
 	// and potentially patches to apply to the handler.
 	Handler Handler
-
-	once sync.Once
-}
-
-func (w *Webhook) setDefaults() {
-	if len(w.Name) == 0 {
-		reg := regexp.MustCompile("[^a-zA-Z0-9]+")
-		processedPath := strings.ToLower(reg.ReplaceAllString(w.Path, ""))
-		w.Name = processedPath + ".example.com"
-	}
 }
 
 // Webhook implements Handler interface.
@@ -144,24 +129,13 @@ func (w *Webhook) Handle(ctx context.Context, req Request) Response {
 	return resp
 }
 
-// GetName returns the name of the webhook.
-func (w *Webhook) GetName() string {
-	w.once.Do(w.setDefaults)
-	return w.Name
-}
-
 // GetPath returns the path that the webhook registered.
 func (w *Webhook) GetPath() string {
-	w.once.Do(w.setDefaults)
 	return w.Path
 }
 
 // Validate validates if the webhook is valid.
 func (w *Webhook) Validate() error {
-	w.once.Do(w.setDefaults)
-	if len(w.Name) == 0 {
-		return errors.New("field Name should not be empty")
-	}
 	if len(w.Path) == 0 {
 		return errors.New("field Path should not be empty")
 	}

pkg/webhook/admission/webhook_test.go

@@ -124,15 +124,6 @@ var _ = Describe("Admission Webhooks", func() {
 		Expect(resp.Patch).To(Equal([]byte(`[{"op":"add","path":"/a","value":2},{"op":"replace","path":"/b","value":4}]`)))
 	})
 
-	It("should default a name if none is given", func() {
-		wh := &Webhook{
-			Path:    "/somepath",
-			Handler: &fakeHandler{},
-		}
-
-		Expect(wh.GetName()).NotTo(BeEmpty())
-	})
-
 	Context("validation", func() {
 		It("should accept a properly populated webhook", func() {
 			wh := &Webhook{