poc: fix lib import

Signed-off-by: realanna <anna.reale@dynatrace.com>
keptn · May 17, 2023 · 4385f3e · 4385f3e
1 parent 9a731a7
commit 4385f3e
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 64 deletions.
diff --git a/klt-cert-manager/pkg/fake/manager_mock.go b/klt-cert-manager/pkg/fake/manager_mock.go
diff --git a/klt-cert-manager/pkg/webhook/builder_test.go b/klt-cert-manager/pkg/webhook/builder_test.go
@@ -45,8 +45,8 @@ func TestBuilder_Run(t *testing.T) {
 	mockManager.GetAPIReaderFunc = func() client.Reader {
 		return newFakeClient()
 	}
-	webhookServer := &webhook.Server{}
-	mockManager.GetWebhookServerFunc = func() *webhook.Server {
+	webhookServer := webhook.NewServer(webhook.Options{})
+	mockManager.GetWebhookServerFunc = func() webhook.Server {
 		return webhookServer
 	}
 

diff --git a/klt-cert-manager/pkg/webhook/manager.go b/klt-cert-manager/pkg/webhook/manager.go
@@ -4,6 +4,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 const (
@@ -43,9 +44,10 @@ func (provider WebhookProvider) createOptions(scheme *runtime.Scheme, namespace
 }
 
 func (provider WebhookProvider) SetupWebhookServer(mgr manager.Manager) {
+
 	webhookServer := mgr.GetWebhookServer()
-	webhookServer.CertDir = provider.certificateDirectory
-	webhookServer.KeyName = provider.keyFileName
-	webhookServer.CertName = provider.certificateFileName
+	webhookServer.(*webhook.DefaultServer).Options.CertDir = provider.certificateDirectory
+	webhookServer.(*webhook.DefaultServer).Options.KeyName = provider.keyFileName
+	webhookServer.(*webhook.DefaultServer).Options.CertName = provider.certificateFileName
 
 }
diff --git a/klt-cert-manager/pkg/webhook/manager_test.go b/klt-cert-manager/pkg/webhook/manager_test.go
@@ -31,23 +31,23 @@ func TestCreateOptions(t *testing.T) {
 	})
 	t.Run("configures webhooks server", func(t *testing.T) {
 		provider := NewWebhookManagerProvider("certs-dir", "key-file", "cert-file")
-		expectedWebhookServer := &webhook.Server{}
+		expectedWebhookServer := webhook.NewServer(webhook.Options{})
 
 		mgr := &fake.MockManager{
-			GetWebhookServerFunc: func() *webhook.Server {
+			GetWebhookServerFunc: func() webhook.Server {
 				return expectedWebhookServer
 			},
 		}
 
 		provider.SetupWebhookServer(mgr)
 
-		assert.Equal(t, "certs-dir", expectedWebhookServer.CertDir)
-		assert.Equal(t, "key-file", expectedWebhookServer.KeyName)
-		assert.Equal(t, "cert-file", expectedWebhookServer.CertName)
+		assert.Equal(t, "certs-dir", expectedWebhookServer.(*webhook.DefaultServer).Options.CertDir)
+		assert.Equal(t, "key-file", expectedWebhookServer.(*webhook.DefaultServer).Options.KeyName)
+		assert.Equal(t, "cert-file", expectedWebhookServer.(*webhook.DefaultServer).Options.CertName)
 
 		mgrWebhookServer := mgr.GetWebhookServer()
-		assert.Equal(t, "certs-dir", mgrWebhookServer.CertDir)
-		assert.Equal(t, "key-file", mgrWebhookServer.KeyName)
-		assert.Equal(t, "cert-file", mgrWebhookServer.CertName)
+		assert.Equal(t, "certs-dir", mgrWebhookServer.(*webhook.DefaultServer).Options.CertDir)
+		assert.Equal(t, "key-file", mgrWebhookServer.(*webhook.DefaultServer).Options.KeyName)
+		assert.Equal(t, "cert-file", mgrWebhookServer.(*webhook.DefaultServer).Options.CertName)
 	})
 }