From d100f4647db88ce48a80dd66b731c7553c26746e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?=
<charled.breteche@gmail.com>
Date: Wed, 14 Dec 2022 02:00:29 +0100
Subject: [PATCH] chore: remove secrets client from webhook controller (#5682)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
Co-authored-by: Jim Bugwadia <jim@nirmata.com>
---
cmd/kyverno/main.go | 1 -
pkg/controllers/webhook/controller.go | 3 ---
2 files changed, 4 deletions(-)
diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go
index 4c0874cfb8..eb8bfc2cdc 100644
--- a/cmd/kyverno/main.go
+++ b/cmd/kyverno/main.go
@@ -279,7 +279,6 @@ func createrLeaderControllers(
)
webhookController := webhookcontroller.NewController(
dynamicClient.Discovery(),
- kubeClient.CoreV1().Secrets(config.KyvernoNamespace()),
kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations(),
kubeClient.AdmissionregistrationV1().ValidatingWebhookConfigurations(),
kubeClient.CoordinationV1().Leases(config.KyvernoNamespace()),
diff --git a/pkg/controllers/webhook/controller.go b/pkg/controllers/webhook/controller.go
index a8f3f18a75..d8893fe6aa 100644
--- a/pkg/controllers/webhook/controller.go
+++ b/pkg/controllers/webhook/controller.go
@@ -71,7 +71,6 @@ var (
type controller struct {
// clients
discoveryClient dclient.IDiscovery
- secretClient controllerutils.GetClient[*corev1.Secret]
mwcClient controllerutils.ObjectClient[*admissionregistrationv1.MutatingWebhookConfiguration]
vwcClient controllerutils.ObjectClient[*admissionregistrationv1.ValidatingWebhookConfiguration]
leaseClient controllerutils.ObjectClient[*coordinationv1.Lease]
@@ -103,7 +102,6 @@ type controller struct {
func NewController(
discoveryClient dclient.IDiscovery,
- secretClient controllerutils.GetClient[*corev1.Secret],
mwcClient controllerutils.ObjectClient[*admissionregistrationv1.MutatingWebhookConfiguration],
vwcClient controllerutils.ObjectClient[*admissionregistrationv1.ValidatingWebhookConfiguration],
leaseClient controllerutils.ObjectClient[*coordinationv1.Lease],
@@ -124,7 +122,6 @@ func NewController(
queue := workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), ControllerName)
c := controller{
discoveryClient: discoveryClient,
- secretClient: secretClient,
mwcClient: mwcClient,
vwcClient: vwcClient,
leaseClient: leaseClient,