Try adding TLSOpts to all test mgrs.

k8ssandra · May 13, 2024 · 74019b1 · 74019b1
1 parent e49db2f
commit 74019b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/apis/k8ssandra/v1alpha1/k8ssandracluster_webhook_test.go b/apis/k8ssandra/v1alpha1/k8ssandracluster_webhook_test.go
@@ -110,6 +110,7 @@ func TestWebhook(t *testing.T) {
 		Port:    webhookInstallOptions.LocalServingPort,
 		Host:    webhookInstallOptions.LocalServingHost,
 		CertDir: webhookInstallOptions.LocalServingCertDir,
+		TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 	})
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{

diff --git a/apis/medusa/v1alpha1/medusa_webhook_test.go b/apis/medusa/v1alpha1/medusa_webhook_test.go
@@ -84,6 +84,7 @@ func TestMedusaWebhooks(t *testing.T) {
 		Port:    webhookInstallOptions.LocalServingPort,
 		Host:    webhookInstallOptions.LocalServingHost,
 		CertDir: webhookInstallOptions.LocalServingCertDir,
+		TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 	})
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{

diff --git a/controllers/medusa/controllers_test.go b/controllers/medusa/controllers_test.go
@@ -2,6 +2,7 @@ package medusa
 
 import (
 	"context"
+	"crypto/tls"
 	"testing"
 	"time"
 
@@ -95,6 +96,7 @@ func setupMedusaBackupTestEnv(t *testing.T, ctx context.Context) *testutils.Mult
 				Port:    env.WebhookInstallOptions.LocalServingPort,
 				Host:    env.WebhookInstallOptions.LocalServingHost,
 				CertDir: env.WebhookInstallOptions.LocalServingCertDir,
+				TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 			})
 
 			dataPlaneMgr, err := ctrl.NewManager(env.Config, ctrl.Options{
@@ -169,6 +171,7 @@ func setupMedusaRestoreJobTestEnv(t *testing.T, ctx context.Context) *testutils.
 				Port:    env.WebhookInstallOptions.LocalServingPort,
 				Host:    env.WebhookInstallOptions.LocalServingHost,
 				CertDir: env.WebhookInstallOptions.LocalServingCertDir,
+				TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 			})
 
 			dataPlaneMgr, err := ctrl.NewManager(env.Config, ctrl.Options{
@@ -242,6 +245,7 @@ func setupMedusaTaskTestEnv(t *testing.T, ctx context.Context) *testutils.MultiC
 				Port:    env.WebhookInstallOptions.LocalServingPort,
 				Host:    env.WebhookInstallOptions.LocalServingHost,
 				CertDir: env.WebhookInstallOptions.LocalServingCertDir,
+				TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 			})
 
 			dataPlaneMgr, err := ctrl.NewManager(env.Config, ctrl.Options{
@@ -320,6 +324,7 @@ func setupMedusaConfigurationTestEnv(t *testing.T, ctx context.Context) *testuti
 				Port:    env.WebhookInstallOptions.LocalServingPort,
 				Host:    env.WebhookInstallOptions.LocalServingHost,
 				CertDir: env.WebhookInstallOptions.LocalServingCertDir,
+				TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 			})
 
 			dataPlaneMgr, err := ctrl.NewManager(env.Config, ctrl.Options{

diff --git a/pkg/test/testenv.go b/pkg/test/testenv.go
@@ -83,6 +83,7 @@ func (e *TestEnv) Start(ctx context.Context, t *testing.T, initReconcilers func(
 		Port:    webhookInstallOptions.LocalServingPort,
 		Host:    webhookInstallOptions.LocalServingHost,
 		CertDir: webhookInstallOptions.LocalServingCertDir,
+		TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 	})
 
 	k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
@@ -238,6 +239,7 @@ func (e *MultiClusterTestEnv) Start(ctx context.Context, t *testing.T, initRecon
 		Port:    webhookInstallOptions.LocalServingPort,
 		Host:    webhookInstallOptions.LocalServingHost,
 		CertDir: webhookInstallOptions.LocalServingCertDir,
+		TLSOpts: []func(*tls.Config){func(config *tls.Config) {}},
 	})
 
 	k8sManager, err := ctrl.NewManager(cfgs[0], ctrl.Options{