Skip to content

Commit

Permalink
pass correct context to leader election manager (#205)
Browse files Browse the repository at this point in the history
  • Loading branch information
zdarovich authored Dec 11, 2023
1 parent e691e12 commit 53c5ce8
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions cmd/kvisor/agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 53c5ce8

Please sign in to comment.