diff --git a/controllers/consoleplugin/consoleplugin_test.go b/controllers/consoleplugin/consoleplugin_test.go index 911808cf6..4c57e5e97 100644 --- a/controllers/consoleplugin/consoleplugin_test.go +++ b/controllers/consoleplugin/consoleplugin_test.go @@ -326,8 +326,8 @@ func TestConfigMapContent(t *testing.T) { assert.NotEmpty(config.Frontend.Columns) assert.NotEmpty(config.Frontend.Filters) assert.Equal(config.Frontend.Sampling, 1) - assert.Equal(config.Frontend.Deduper.Mark, true) - assert.Equal(config.Frontend.Deduper.Merge, false) + assert.Equal(config.Frontend.Deduper.Mark, false) + assert.Equal(config.Frontend.Deduper.Merge, true) } func TestConfigMapError(t *testing.T) { diff --git a/controllers/ebpf/agent_controller.go b/controllers/ebpf/agent_controller.go index 500cf22ab..2e825b5c6 100644 --- a/controllers/ebpf/agent_controller.go +++ b/controllers/ebpf/agent_controller.go @@ -72,8 +72,8 @@ const ( const ( EnvDedupeJustMark = "DEDUPER_JUST_MARK" EnvDedupeMerge = "DEDUPER_MERGE" - DedupeJustMarkDefault = "true" - DedupeMergeDefault = "false" + DedupeJustMarkDefault = "false" + DedupeMergeDefault = "true" ) type reconcileAction int diff --git a/controllers/flp/flp_test.go b/controllers/flp/flp_test.go index afdb92176..75fcd19e1 100644 --- a/controllers/flp/flp_test.go +++ b/controllers/flp/flp_test.go @@ -712,7 +712,6 @@ func TestConfigMapShouldDeserializeAsJSONWithLokiStack(t *testing.T) { "DstK8S_Type", "K8S_FlowLayer", "_RecordType", - "FlowDirection", }, lokiCfg.Labels) assert.Equal(`{app="netobserv-flowcollector"}`, fmt.Sprintf("%v", lokiCfg.StaticLabels))