Adjust to webhook.Server changes

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

bootstrap/kubeadm/main.go

@@ -202,11 +202,13 @@ func main() {
 				},
 			},
 		},
-		WebhookServer: &webhook.Server{
-			Port:    webhookPort,
-			CertDir: webhookCertDir,
-			TLSOpts: tlsOptionOverrides,
-		},
+		WebhookServer: webhook.NewServer(
+			webhook.Options{
+				Port:    webhookPort,
+				CertDir: webhookCertDir,
+				TLSOpts: tlsOptionOverrides,
+			},
+		),
 	}
 
 	mgr, err := ctrl.NewManager(restConfig, ctrlOptions)

controlplane/kubeadm/main.go

@@ -210,11 +210,13 @@ func main() {
 				},
 			},
 		},
-		WebhookServer: &webhook.Server{
-			Port:    webhookPort,
-			CertDir: webhookCertDir,
-			TLSOpts: tlsOptionOverrides,
-		},
+		WebhookServer: webhook.NewServer(
+			webhook.Options{
+				Port:    webhookPort,
+				CertDir: webhookCertDir,
+				TLSOpts: tlsOptionOverrides,
+			},
+		),
 	}
 
 	mgr, err := ctrl.NewManager(restConfig, ctrlOptions)

exp/runtime/server/server.go

@@ -44,7 +44,7 @@ var DefaultPort = 9443
 // Server is a runtime webhook server.
 type Server struct {
 	catalog  *runtimecatalog.Catalog
-	server   *webhook.Server
+	server   webhook.Server
 	handlers map[string]ExtensionHandler
 }
 
@@ -81,19 +81,21 @@ func New(options Options) (*Server, error) {
 		options.CertDir = filepath.Join(os.TempDir(), "k8s-webhook-server", "serving-certs")
 	}
 
-	webhookServer := &webhook.Server{
-		Port:       options.Port,
-		Host:       options.Host,
-		CertDir:    options.CertDir,
-		CertName:   "tls.crt",
-		KeyName:    "tls.key",
-		WebhookMux: http.NewServeMux(),
-		TLSOpts: []func(*tls.Config){
-			func(cfg *tls.Config) {
-				cfg.MinVersion = tls.VersionTLS13
+	webhookServer := webhook.NewServer(
+		webhook.Options{
+			Port:       options.Port,
+			Host:       options.Host,
+			CertDir:    options.CertDir,
+			CertName:   "tls.crt",
+			KeyName:    "tls.key",
+			WebhookMux: http.NewServeMux(),
+			TLSOpts: []func(*tls.Config){
+				func(cfg *tls.Config) {
+					cfg.MinVersion = tls.VersionTLS13
+				},
 			},
 		},
-	}
+	)
 
 	return &Server{
 		catalog:  options.Catalog,

internal/controllers/topology/cluster/structuredmerge/serversidepathhelper_test.go

@@ -785,7 +785,7 @@ func TestServerSideApplyWithDefaulting(t *testing.T) {
 // It also calculates and returns the corresponding MutatingWebhookConfiguration.
 // Note: To activate the webhook, the MutatingWebhookConfiguration has to be deployed.
 func setupWebhookWithManager(ns *corev1.Namespace) (*KubeadmConfigTemplateTestDefaulter, *admissionv1.MutatingWebhookConfiguration, error) {
-	webhookServer := env.Manager.GetWebhookServer()
+	webhookServer := env.Manager.GetWebhookServer().(*webhook.DefaultServer)
 
 	// Calculate webhook host and path.
 	// Note: This is done the same way as in our envtest package.
@@ -802,7 +802,7 @@ func setupWebhookWithManager(ns *corev1.Namespace) (*KubeadmConfigTemplateTestDe
 		admission.WithCustomDefaulter(env.Manager.GetScheme(), &bootstrapv1.KubeadmConfigTemplate{}, defaulter))
 
 	// Calculate the MutatingWebhookConfiguration
-	caBundle, err := os.ReadFile(filepath.Join(webhookServer.CertDir, webhookServer.CertName))
+	caBundle, err := os.ReadFile(filepath.Join(webhookServer.Options.CertDir, webhookServer.Options.CertName))
 	if err != nil {
 		return nil, nil, err
 	}
@@ -816,7 +816,7 @@ func setupWebhookWithManager(ns *corev1.Namespace) (*KubeadmConfigTemplateTestDe
 			{
 				Name: ns.Name + ".kubeadmconfigtemplate.bootstrap.cluster.x-k8s.io",
 				ClientConfig: admissionv1.WebhookClientConfig{
-					URL:      pointer.String(fmt.Sprintf("https://%s%s", net.JoinHostPort(webhookHost, strconv.Itoa(webhookServer.Port)), webhookPath)),
+					URL:      pointer.String(fmt.Sprintf("https://%s%s", net.JoinHostPort(webhookHost, strconv.Itoa(webhookServer.Options.Port)), webhookPath)),
 					CABundle: caBundle,
 				},
 				Rules: []admissionv1.RuleWithOperations{

internal/test/envtest/environment.go

@@ -257,11 +257,13 @@ func newEnvironment(uncachedObjs ...client.Object) *Environment {
 				DisableFor: objs,
 			},
 		},
-		WebhookServer: &webhook.Server{
-			Port:    env.WebhookInstallOptions.LocalServingPort,
-			CertDir: env.WebhookInstallOptions.LocalServingCertDir,
-			Host:    host,
-		},
+		WebhookServer: webhook.NewServer(
+			webhook.Options{
+				Port:    env.WebhookInstallOptions.LocalServingPort,
+				CertDir: env.WebhookInstallOptions.LocalServingCertDir,
+				Host:    host,
+			},
+		),
 	}
 
 	mgr, err := ctrl.NewManager(env.Config, options)

main.go

@@ -274,11 +274,13 @@ func main() {
 				},
 			},
 		},
-		WebhookServer: &webhook.Server{
-			Port:    webhookPort,
-			CertDir: webhookCertDir,
-			TLSOpts: tlsOptionOverrides,
-		},
+		WebhookServer: webhook.NewServer(
+			webhook.Options{
+				Port:    webhookPort,
+				CertDir: webhookCertDir,
+				TLSOpts: tlsOptionOverrides,
+			},
+		),
 	}
 
 	mgr, err := ctrl.NewManager(restConfig, ctrlOptions)

test/infrastructure/docker/main.go

@@ -208,11 +208,13 @@ func main() {
 				},
 			},
 		},
-		WebhookServer: &webhook.Server{
-			Port:    webhookPort,
-			CertDir: webhookCertDir,
-			TLSOpts: tlsOptionOverrides,
-		},
+		WebhookServer: webhook.NewServer(
+			webhook.Options{
+				Port:    webhookPort,
+				CertDir: webhookCertDir,
+				TLSOpts: tlsOptionOverrides,
+			},
+		),
 	}
 
 	mgr, err := ctrl.NewManager(restConfig, ctrlOptions)