Skip to content

Commit 66389c5

Browse files
committed
fix cluster agent compliance path
1 parent 3bc98a6 commit 66389c5

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

cmd/cluster-agent/subcommands/start/command.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ func start(log log.Component,
523523
go func() {
524524
defer wg.Done()
525525

526-
if err := runCompliance(mainCtx, demultiplexer, wmeta, filterStore, apiCl, compression, ipc, le.IsLeader); err != nil {
526+
if err := runCompliance(mainCtx, demultiplexer, wmeta, filterStore, apiCl, compression, le.IsLeader); err != nil {
527527
pkglog.Errorf("Error while running compliance agent: %v", err)
528528
}
529529
}()

cmd/cluster-agent/subcommands/start/compliance.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
"k8s.io/client-go/dynamic"
1515

16-
ipc "github.com/DataDog/datadog-agent/comp/core/ipc/def"
1716
workloadfilter "github.com/DataDog/datadog-agent/comp/core/workloadfilter/def"
1817
workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def"
1918
logscompression "github.com/DataDog/datadog-agent/comp/serializer/logscompression/def"
@@ -27,9 +26,9 @@ import (
2726
"github.com/DataDog/datadog-agent/pkg/util/startstop"
2827
)
2928

30-
func runCompliance(ctx context.Context, senderManager sender.SenderManager, wmeta workloadmeta.Component, filterStore workloadfilter.Component, apiCl *apiserver.APIClient, compression logscompression.Component, ipc ipc.Component, isLeader func() bool) error {
29+
func runCompliance(ctx context.Context, senderManager sender.SenderManager, wmeta workloadmeta.Component, filterStore workloadfilter.Component, apiCl *apiserver.APIClient, compression logscompression.Component, isLeader func() bool) error {
3130
stopper := startstop.NewSerialStopper()
32-
if err := startCompliance(ctx, senderManager, wmeta, filterStore, stopper, apiCl, isLeader, compression, ipc); err != nil {
31+
if err := startCompliance(ctx, senderManager, wmeta, filterStore, stopper, apiCl, isLeader, compression); err != nil {
3332
return err
3433
}
3534

@@ -39,7 +38,7 @@ func runCompliance(ctx context.Context, senderManager sender.SenderManager, wmet
3938
return nil
4039
}
4140

42-
func startCompliance(ctx context.Context, senderManager sender.SenderManager, wmeta workloadmeta.Component, filterStore workloadfilter.Component, stopper startstop.Stopper, apiCl *apiserver.APIClient, isLeader func() bool, compression logscompression.Component, ipc ipc.Component) error {
41+
func startCompliance(ctx context.Context, senderManager sender.SenderManager, wmeta workloadmeta.Component, filterStore workloadfilter.Component, stopper startstop.Stopper, apiCl *apiserver.APIClient, isLeader func() bool, compression logscompression.Component) error {
4342
endpoints, destinationsCtx, err := seccommon.NewLogContextCompliance()
4443
if err != nil {
4544
log.Error(err)
@@ -63,7 +62,7 @@ func startCompliance(ctx context.Context, senderManager sender.SenderManager, wm
6362
reflectorStore := compliance.NewReflectorStore(apiCl.Cl)
6463
reflectorStore.Run(ctx.Done())
6564

66-
agent := compliance.NewAgent(statsdClient, wmeta, ipc, filterStore, compliance.AgentOptions{
65+
agent := compliance.NewAgent(statsdClient, wmeta, filterStore, hname, compliance.AgentOptions{
6766
ConfigDir: configDir,
6867
Reporter: reporter,
6968
CheckInterval: checkInterval,

0 commit comments

Comments
 (0)