From 31ff5faa8532c7ae04f2c89acba8b17abfcb850f Mon Sep 17 00:00:00 2001 From: Thomas Eckert Date: Fri, 25 Aug 2023 19:55:10 +0000 Subject: [PATCH] backport of commit da2c787fac76327ac1558f8bb4bce1e4f6e27ef2 --- acceptance/tests/cli/cli_install_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/acceptance/tests/cli/cli_install_test.go b/acceptance/tests/cli/cli_install_test.go index 36f5f583a9..1334a251fc 100644 --- a/acceptance/tests/cli/cli_install_test.go +++ b/acceptance/tests/cli/cli_install_test.go @@ -23,11 +23,9 @@ const ipv4RegEx = "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9] func TestInstall(t *testing.T) { cases := map[string]struct { secure bool - tproxy bool }{ - "not-secure": {secure: false, tproxy: false}, - "secure": {secure: true, tproxy: false}, - "not-secure-tproxy": {secure: false, tproxy: true}, + "not-secure": {secure: false}, + "secure": {secure: true}, } for name, c := range cases { @@ -36,7 +34,6 @@ func TestInstall(t *testing.T) { require.NoError(t, err) cfg := suite.Config() - cfg.EnableTransparentProxy = c.tproxy ctx := suite.Environment().DefaultContext(t) connHelper := connhelper.ConnectHelper{ @@ -99,7 +96,7 @@ func TestInstall(t *testing.T) { logger.Log(t, string(upstreamsOut)) require.NoError(t, err) - if c.tproxy { + if cfg.EnableTransparentProxy { // If tproxy is enabled we are looking for the upstream ip which is the ClusterIP of the Kubernetes Service serverService, err := connHelper.Ctx.KubernetesClient(t).CoreV1().Services(connHelper.Ctx.KubectlOptions(t).Namespace).List(context.Background(), metav1.ListOptions{ FieldSelector: "metadata.name=static-server",