From 53c5ce8db65605f4db91e786ef201a1e2a8fdc7f Mon Sep 17 00:00:00 2001 From: Aleksander Belov Date: Mon, 11 Dec 2023 15:50:44 +0700 Subject: [PATCH] pass correct context to leader election manager (#205) --- cmd/kvisor/agent/agent.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/kvisor/agent/agent.go b/cmd/kvisor/agent/agent.go index fb6ab59e..624e52d4 100644 --- a/cmd/kvisor/agent/agent.go +++ b/cmd/kvisor/agent/agent.go @@ -14,7 +14,6 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" awseks "github.com/aws/aws-sdk-go-v2/service/eks" "github.com/bombsimon/logrusr/v4" - "github.com/castai/kvisor/jobsgc" "github.com/cenkalti/backoff/v4" "github.com/containerd/containerd/pkg/atomic" "github.com/open-policy-agent/cert-controller/pkg/rotator" @@ -49,6 +48,7 @@ import ( "github.com/castai/kvisor/config" "github.com/castai/kvisor/delta" "github.com/castai/kvisor/imagescan" + "github.com/castai/kvisor/jobsgc" "github.com/castai/kvisor/kube" "github.com/castai/kvisor/linters/kubebench" "github.com/castai/kvisor/linters/kubelinter" @@ -248,7 +248,7 @@ func run(ctx context.Context, logger logrus.FieldLogger, castaiClient castai.Cli resyncObserver := delta.ResyncObserver(ctx, log, snapshotProvider, castaiClient) telemetryManager.AddObservers(resyncObserver) - featureObserver, featuresCtx := telemetry.ObserveDisabledFeatures(ctx, cfg, log) + featureObserver, _ := telemetry.ObserveDisabledFeatures(ctx, cfg, log) telemetryManager.AddObservers(featureObserver) scheme := runtime.NewScheme() @@ -378,8 +378,7 @@ func run(ctx context.Context, logger logrus.FieldLogger, castaiClient castai.Cli if err := mngr.Add(kubeCtrl); err != nil { return fmt.Errorf("add kube controller: %w", err) } - - return mngr.Start(featuresCtx) + return mngr.Start(ctx) } func retrieveKubeConfig(log logrus.FieldLogger, kubepath string) (*rest.Config, error) {