make innerjoinunique (current behavior) the default merge mode

Signed-off-by: Josh French <[email protected]>
argoproj · Jan 10, 2025 · 10437df · 10437df
1 parent 17917bb
commit 10437df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/applicationset/generators/merge.go b/applicationset/generators/merge.go
@@ -193,7 +193,7 @@ func getJoinType(joinType string) (argoprojiov1alpha1.MergeMode, error) {
 		return argoprojiov1alpha1.MergeMode(joinType), nil
 	case "":
 		// No merge mode passed. Using default left-join-uniq
-		return LeftJoinUniq, nil
+		return InnerJoinUniq, nil
 	default:
 		return "", fmt.Errorf("incorrect merge mode passed. %s merge mode is not supported", joinType)
 	}

diff --git a/applicationset/generators/merge_test.go b/applicationset/generators/merge_test.go
@@ -622,7 +622,7 @@ func TestMergeModeDetection(t *testing.T) {
 		{
 			name:     "no mode passed, should take default join type",
 			joinType: "",
-			expected: LeftJoinUniq,
+			expected: InnerJoinUniq,
 		},
 	}