revert attempt to enable webhoks in tests

Author: erikgb

internal/integtest/setup.go

@@ -71,10 +71,6 @@ func HNCBeforeSuite() {
 	By("configuring test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
-		// todo(erikgb): Fix tests that breaks when enabling webhooks
-		//WebhookInstallOptions: envtest.WebhookInstallOptions{
-		//	Paths: []string{filepath.Join("..", "..", "config", "webhook")},
-		//},
 	}
 
 	By("starting test environment")
@@ -98,14 +94,10 @@ func HNCBeforeSuite() {
 	// CF: https://github.com/microsoft/azure-databricks-operator/blob/0f722a710fea06b86ecdccd9455336ca712bf775/controllers/suite_test.go
 
 	By("creating manager")
-	webhookInstallOptions := &testEnv.WebhookInstallOptions
 	k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
 		NewClient:          config.NewClient(false),
 		MetricsBindAddress: "0", // disable metrics serving since 'go test' runs multiple suites in parallel processes
 		Scheme:             scheme.Scheme,
-		Host:               webhookInstallOptions.LocalServingHost,
-		Port:               webhookInstallOptions.LocalServingPort,
-		CertDir:            webhookInstallOptions.LocalServingCertDir,
 	})
 	Expect(err).ToNot(HaveOccurred())
 
@@ -119,7 +111,6 @@ func HNCBeforeSuite() {
 	TestForest = forest.NewForest()
 	err = setup.CreateReconcilers(k8sManager, TestForest, opts)
 	Expect(err).ToNot(HaveOccurred())
-	setup.CreateWebhooks(k8sManager, TestForest, opts)
 
 	By("Creating clients")
 	K8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})

internal/setup/reconcilers.go

@@ -35,7 +35,7 @@ func Create(log logr.Logger, mgr ctrl.Manager, f *forest.Forest, opts Options) {
 
 	if !opts.NoWebhooks {
 		log.Info("Registering validating webhook (won't work when running locally; use --no-webhooks)")
-		CreateWebhooks(mgr, f, opts)
+		createWebhooks(mgr, f, opts)
 	}
 
 	log.Info("Registering reconcilers")

internal/setup/webhooks.go

@@ -54,8 +54,8 @@ func ManageCerts(mgr ctrl.Manager, setupFinished chan struct{}, restartOnSecretR
 	})
 }
 
-// CreateWebhooks creates all mutators and validators.
-func CreateWebhooks(mgr ctrl.Manager, f *forest.Forest, opts Options) {
+// createWebhooks creates all mutators and validators.
+func createWebhooks(mgr ctrl.Manager, f *forest.Forest, opts Options) {
 	// Create webhook for Hierarchy
 	mgr.GetWebhookServer().Register(hierarchyconfig.ServingPath, &webhook.Admission{Handler: &hierarchyconfig.Validator{
 		Log:    ctrl.Log.WithName("hierarchyconfig").WithName("validate"),