fix: ExternalTargetCANamespace name

The fix for connectivity tests ExternalTargetCANamespace name. The name must be namespace specific in case of tests concurrent run for proper CiliumNetworkPolicy provisioning. Signed-off-by: viktor-kurchenko <[email protected]>
cilium · Jun 26, 2024 · 76043c8 · 76043c8
1 parent 5146f46
commit 76043c8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/cli/connectivity.go b/cli/connectivity.go
@@ -238,7 +238,9 @@ func newConnectivityTests(params check.Parameters, logger *check.ConcurrentLogge
 	connTests := make([]*check.ConnectivityTest, 0, params.TestConcurrency)
 	for i := 0; i < params.TestConcurrency; i++ {
 		params := params
-		params.TestNamespace = fmt.Sprintf("%s-%d", params.TestNamespace, i+1)
+		ns := fmt.Sprintf("%s-%d", params.TestNamespace, i+1)
+		params.TestNamespace = ns
+		params.ExternalTargetCANamespace = ns
 		params.ExternalDeploymentPort += i
 		params.EchoServerHostPort += i
 		params.JunitFile = junit.NamespacedFileName(params.TestNamespace, params.JunitFile)

diff --git a/cli/connectivity_test.go b/cli/connectivity_test.go
@@ -20,26 +20,29 @@ func TestNewConnectivityTests(t *testing.T) {
 	}{
 		{
 			params: check.Parameters{
-				FlowValidation: check.FlowValidationModeDisabled,
-				TestNamespace:  "cilium-test",
+				FlowValidation:            check.FlowValidationModeDisabled,
+				TestNamespace:             "cilium-test",
+				ExternalTargetCANamespace: "cilium-test",
 			},
 			expectedCount:          1,
 			expectedTestNamespaces: []string{"cilium-test"},
 		},
 		{
 			params: check.Parameters{
-				FlowValidation:  check.FlowValidationModeDisabled,
-				TestNamespace:   "cilium-test",
-				TestConcurrency: -1,
+				FlowValidation:            check.FlowValidationModeDisabled,
+				TestNamespace:             "cilium-test",
+				ExternalTargetCANamespace: "cilium-test",
+				TestConcurrency:           -1,
 			},
 			expectedCount:          1,
 			expectedTestNamespaces: []string{"cilium-test"},
 		},
 		{
 			params: check.Parameters{
-				FlowValidation:  check.FlowValidationModeDisabled,
-				TestNamespace:   "cilium-test",
-				TestConcurrency: 3,
+				FlowValidation:            check.FlowValidationModeDisabled,
+				TestNamespace:             "cilium-test",
+				ExternalTargetCANamespace: "cilium-test",
+				TestConcurrency:           3,
 			},
 			expectedCount:          3,
 			expectedTestNamespaces: []string{"cilium-test-1", "cilium-test-2", "cilium-test-3"},
@@ -53,6 +56,7 @@ func TestNewConnectivityTests(t *testing.T) {
 		require.Equal(t, tt.expectedCount, len(actual))
 		for i, n := range tt.expectedTestNamespaces {
 			require.Equal(t, n, actual[i].Params().TestNamespace)
+			require.Equal(t, n, actual[i].Params().ExternalTargetCANamespace)
 		}
 	}
 }