From 4a1d50a933c9f37a30627a6d3f8400bc93d5f2b7 Mon Sep 17 00:00:00 2001 From: viktor-kurchenko Date: Wed, 26 Jun 2024 16:29:55 +0300 Subject: [PATCH] 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 --- cli/connectivity.go | 4 +++- cli/connectivity_test.go | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cli/connectivity.go b/cli/connectivity.go index ebff7abd7f..ba0ff55139 100644 --- 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 index 5a846270bd..532dfed967 100644 --- 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) } } }