Start webhooks on the same address as the server

Signed-off-by: Nelo-T. Wallus <[email protected]>

Author: ntnn

test/e2e/apibinding/apibinding_webhook_test.go

@@ -157,7 +157,7 @@ func TestAPIBindingMutatingWebhook(t *testing.T) {
 		port, err := kcptestingserver.GetFreePort(t)
 		require.NoError(t, err, "failed to get free port for test webhook")
 		dirPath := filepath.Dir(server.KubeconfigPath())
-		testWebhooks[cluster].StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), port)
+		testWebhooks[cluster].StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), cfg.Host, port)
 
 		sideEffect := admissionregistrationv1.SideEffectClassNone
 		url := testWebhooks[cluster].GetURL()
@@ -312,7 +312,7 @@ func TestAPIBindingValidatingWebhook(t *testing.T) {
 		port, err := kcptestingserver.GetFreePort(t)
 		require.NoError(t, err, "failed to get free port for test webhook")
 		dirPath := filepath.Dir(server.KubeconfigPath())
-		testWebhooks[cluster].StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), port)
+		testWebhooks[cluster].StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), cfg.Host, port)
 
 		kcptestinghelpers.Eventually(t, func() (bool, string) {
 			cl := gohttp.Client{Transport: &gohttp.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}

test/e2e/conformance/webhook_test.go

@@ -94,7 +94,7 @@ func TestMutatingWebhookInWorkspace(t *testing.T) {
 	port, err := kcptestingserver.GetFreePort(t)
 	require.NoError(t, err, "failed to get free port for test webhook")
 	dirPath := filepath.Dir(server.KubeconfigPath())
-	testWebhook.StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), port)
+	testWebhook.StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), cfg.Host, port)
 
 	orgPath, _ := framework.NewOrganizationFixture(t, server) //nolint:staticcheck // TODO: switch to NewWorkspaceFixture.
 	ws1Path, ws1 := kcptesting.NewWorkspaceFixture(t, server, orgPath)
@@ -212,7 +212,7 @@ func TestValidatingWebhookInWorkspace(t *testing.T) {
 	port, err := kcptestingserver.GetFreePort(t)
 	require.NoError(t, err, "failed to get free port for test webhook")
 	dirPath := filepath.Dir(server.KubeconfigPath())
-	testWebhook.StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), port)
+	testWebhook.StartTLS(t, filepath.Join(dirPath, "apiserver.crt"), filepath.Join(dirPath, "apiserver.key"), cfg.Host, port)
 
 	orgPath, _ := framework.NewOrganizationFixture(t, server) //nolint:staticcheck // TODO: switch to NewWorkspaceFixture.
 	ws1, _ := kcptesting.NewWorkspaceFixture(t, server, orgPath)

test/e2e/fixtures/webhook/webhook.go

@@ -22,7 +22,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
+	"net/url"
 	"sync"
 	"testing"
 
@@ -38,18 +40,29 @@ type AdmissionWebhookServer struct {
 
 	t *testing.T
 
-	port  string
-	lock  sync.Mutex
-	calls int
+	host, port string
+	lock       sync.Mutex
+	calls      int
 }
 
-func (s *AdmissionWebhookServer) StartTLS(t *testing.T, certFile, keyFile string, port string) {
+func (s *AdmissionWebhookServer) StartTLS(t *testing.T, certFile, keyFile, host, port string) {
 	t.Helper()
 
 	s.t = t
+	// The host passed to StartTLS is the Host of the rest.Config, which
+	// can be just host, host:port or a full URL.
+	u, err := url.Parse(host)
+	if err != nil {
+		t.Fatalf("error parsing host %q: %v", host, err)
+	}
+	host, _, err = net.SplitHostPort(u.Host)
+	if err != nil {
+		t.Fatalf("error splitting host %q: %v", u.Host, err)
+	}
+	s.host = host
 	s.port = port
 
-	serv := &http.Server{Addr: fmt.Sprintf(":%v", port), Handler: s}
+	serv := &http.Server{Addr: net.JoinHostPort(s.host, s.port), Handler: s}
 	t.Cleanup(func() {
 		t.Log("Shutting down the HTTP server")
 		err := serv.Shutdown(context.TODO())
@@ -67,7 +80,12 @@ func (s *AdmissionWebhookServer) StartTLS(t *testing.T, certFile, keyFile string
 }
 
 func (s *AdmissionWebhookServer) GetURL() string {
-	return fmt.Sprintf("https://localhost:%v/hello", s.port)
+	u := &url.URL{
+		Scheme: "https",
+		Host:   net.JoinHostPort(s.host, s.port),
+		Path:   "/hello",
+	}
+	return u.String()
 }
 
 func (s *AdmissionWebhookServer) ServeHTTP(resp http.ResponseWriter, req *http.Request) {