diff --git a/cmd/internal/client.go b/cmd/internal/client.go index ec5616e1e6..37be7a23bb 100644 --- a/cmd/internal/client.go +++ b/cmd/internal/client.go @@ -86,7 +86,7 @@ func createKyvernoDynamicClient(logger logr.Logger, ctx context.Context, dyn dyn return client } -func createEventsClient(logger logr.Logger, kube kubernetes.Interface, metricsManager metrics.MetricsConfigManager) eventsv1.EventsV1Interface { +func createEventsClient(logger logr.Logger, metricsManager metrics.MetricsConfigManager) eventsv1.EventsV1Interface { logger = logger.WithName("events-client") logger.Info("create the events client...", "kubeconfig", kubeconfig, "qps", clientRateLimitQPS, "burst", clientRateLimitBurst) client := kubeclient.From(createKubernetesClient(logger, eventsRateLimitQPS, eventsRateLimitBurst), kubeclient.WithTracing()) diff --git a/cmd/internal/imageverifycache.go b/cmd/internal/imageverifycache.go index f3cad27385..60f8499cd0 100644 --- a/cmd/internal/imageverifycache.go +++ b/cmd/internal/imageverifycache.go @@ -1,13 +1,11 @@ package internal import ( - "context" - "github.com/go-logr/logr" "github.com/kyverno/kyverno/pkg/imageverifycache" ) -func setupImageVerifyCache(ctx context.Context, logger logr.Logger) imageverifycache.Client { +func setupImageVerifyCache(logger logr.Logger) imageverifycache.Client { logger = logger.WithName("image-verify-cache").WithValues("enabled", imageVerifyCacheEnabled, "maxsize", imageVerifyCacheMaxSize, "ttl", imageVerifyCacheTTLDuration) logger.Info("setup image verify cache...") opts := []imageverifycache.Option{ diff --git a/cmd/internal/setup.go b/cmd/internal/setup.go index b30a443ffd..040ad51df3 100644 --- a/cmd/internal/setup.go +++ b/cmd/internal/setup.go @@ -72,7 +72,7 @@ func Setup(config Configuration, name string, skipResourceFilters bool) (context } var imageVerifyCache imageverifycache.Client if config.UsesImageVerifyCache() { - imageVerifyCache = setupImageVerifyCache(ctx, logger) + imageVerifyCache = setupImageVerifyCache(logger) } if config.UsesCosign() { setupSigstoreTUF(ctx, logger) @@ -99,7 +99,7 @@ func Setup(config Configuration, name string, skipResourceFilters bool) (context } var eventsClient eventsv1.EventsV1Interface if config.UsesEventsClient() { - eventsClient = createEventsClient(logger, client, metricsManager) + eventsClient = createEventsClient(logger, metricsManager) } var metadataClient metadataclient.UpstreamInterface if config.UsesMetadataClient() { diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go index 03fb81097e..0a3496cf15 100644 --- a/cmd/kyverno/main.go +++ b/cmd/kyverno/main.go @@ -25,7 +25,6 @@ import ( policycachecontroller "github.com/kyverno/kyverno/pkg/controllers/policycache" vapcontroller "github.com/kyverno/kyverno/pkg/controllers/validatingadmissionpolicy-generate" webhookcontroller "github.com/kyverno/kyverno/pkg/controllers/webhook" - engineapi "github.com/kyverno/kyverno/pkg/engine/api" "github.com/kyverno/kyverno/pkg/engine/apicall" "github.com/kyverno/kyverno/pkg/event" "github.com/kyverno/kyverno/pkg/globalcontext/store" @@ -79,13 +78,8 @@ func sanityChecks(apiserverClient apiserver.Interface) error { } func createNonLeaderControllers( - eng engineapi.Engine, - kubeInformer kubeinformers.SharedInformerFactory, kyvernoInformer kyvernoinformer.SharedInformerFactory, - kubeClient kubernetes.Interface, - kyvernoClient versioned.Interface, dynamicClient dclient.Interface, - configuration config.Configuration, policyCache policycache.Cache, ) ([]internal.Controller, func(context.Context) error) { policyCacheController := policycachecontroller.NewController( @@ -426,13 +420,8 @@ func main() { ) // create non leader controllers nonLeaderControllers, nonLeaderBootstrap := createNonLeaderControllers( - engine, - kubeInformer, kyvernoInformer, - setup.KubeClient, - setup.KyvernoClient, setup.KyvernoDynamicClient, - setup.Configuration, policyCache, ) // start informers and wait for cache sync