From 6b65009604f671a37df168ec0c4e2801350dacc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Ma=C5=82ek?= <patryk.malek@konghq.com>
Date: Thu, 13 Nov 2025 17:43:41 +0100
Subject: [PATCH] feat: make webhook setup conditional based on config

---
 pkg/envtest/server.go | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkg/envtest/server.go b/pkg/envtest/server.go
index c9f19da977..671fa5b77f 100644
--- a/pkg/envtest/server.go
+++ b/pkg/envtest/server.go
@@ -98,13 +98,11 @@ type (
 	Arg = process.Arg
 )
 
-var (
-	// EmptyArguments constructs a new set of flags with nothing set.
-	//
-	// This is mostly useful for testing helper methods -- you'll want to call
-	// Configure on the APIServer (or etcd) to configure their arguments.
-	EmptyArguments = process.EmptyArguments
-)
+// EmptyArguments constructs a new set of flags with nothing set.
+//
+// This is mostly useful for testing helper methods -- you'll want to call
+// Configure on the APIServer (or etcd) to configure their arguments.
+var EmptyArguments = process.EmptyArguments
 
 // Environment creates a Kubernetes test environment that will start / stop the Kubernetes control plane and
 // install extension APIs.
@@ -341,8 +339,10 @@ func (te *Environment) Start() (*rest.Config, error) {
 
 	// Call PrepWithoutInstalling to setup certificates first
 	// and have them available to patch CRD conversion webhook as well.
-	if err := te.WebhookInstallOptions.PrepWithoutInstalling(); err != nil {
-		return nil, err
+	if webhooksNeeded(te) {
+		if err := te.WebhookInstallOptions.PrepWithoutInstalling(); err != nil {
+			return nil, err
+		}
 	}
 
 	log.V(1).Info("installing CRDs")
@@ -366,6 +366,18 @@ func (te *Environment) Start() (*rest.Config, error) {
 	return te.Config, nil
 }
 
+func webhooksNeeded(te *Environment) bool {
+	for _, crd := range te.CRDs {
+		if crd.Spec.Conversion != nil &&
+			crd.Spec.Conversion.Webhook != nil {
+			return true
+		}
+	}
+
+	return len(te.WebhookInstallOptions.ValidatingWebhooks) > 0 ||
+		len(te.WebhookInstallOptions.MutatingWebhooks) > 0
+}
+
 // AddUser provisions a new user for connecting to this Environment.  The user will
 // have the specified name & belong to the specified groups.
 //