NETOBSERV-1474: change dup mode to use list as the default

Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
netobserv · Feb 19, 2024 · dd346b8 · dd346b8
1 parent d3053bc
commit dd346b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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))