Enable DUAL_STACK flags at test framework level (istio#46860)

* Temporarily run post submit tests Signed-off-by: Faseela K <faseela.k@est.tech> * revert changes to pre-submit tests Signed-off-by: Faseela K <faseela.k@est.tech> * Enable DUAL_STACK at test framework level Signed-off-by: Faseela K <faseela.k@est.tech> * Temporarily run all integration tests on presubmit Signed-off-by: Faseela K <faseela.k@est.tech> * fix test.mk Signed-off-by: Faseela K <faseela.k@est.tech> * revert tests.mk Signed-off-by: Faseela K <faseela.k@est.tech> --------- Signed-off-by: Faseela K <faseela.k@est.tech>
WillardHu · Sep 7, 2023 · 199c35c · 199c35c
1 parent e071ea9
commit 199c35c
Showing 3 changed files with 7 additions and 31 deletions.
diff --git a/pkg/test/framework/components/istio/kube.go b/pkg/test/framework/components/istio/kube.go
@@ -606,6 +606,11 @@ func commonInstallArgs(ctx resource.Context, cfg Config, c cluster.Cluster, defa
 		args.AppendSet("components.cni.enabled", "true")
 	}
 
+	if ctx.Settings().EnableDualStack {
+		args.AppendSet("values.pilot.env.ISTIO_DUAL_STACK", "true")
+		args.AppendSet("meshConfig.defaultConfig.proxyMetadata.ISTIO_DUAL_STACK", "true")
+	}
+
 	// Include all user-specified values.
 	for k, v := range cfg.Values {
 		args.AppendSet("values."+k, v)

diff --git a/tests/integration/pilot/main_test.go b/tests/integration/pilot/main_test.go
@@ -41,20 +41,7 @@ var (
 func TestMain(m *testing.M) {
 	framework.
 		NewSuite(m).
-		Setup(istio.Setup(&i, func(c resource.Context, cfg *istio.Config) {
-			if c.Settings().EnableDualStack {
-				cfg.ControlPlaneValues = `
-values:
-  pilot:
-    env:
-      ISTIO_DUAL_STACK: true
-meshConfig:
-  defaultConfig:
-    proxyMetadata:
-      ISTIO_DUAL_STACK: "true"
-`
-			}
-		})).
+		Setup(istio.Setup(&i, nil)).
 		Setup(deployment.SetupSingleNamespace(&apps, deployment.Config{})).
 		Setup(func(t resource.Context) error {
 			gatewayConformanceInputs.Client = t.Clusters().Default()

diff --git a/tests/integration/security/main_test.go b/tests/integration/security/main_test.go
@@ -49,8 +49,7 @@ func TestMain(m *testing.M) {
 	framework.
 		NewSuite(m).
 		Setup(istio.Setup(&i, func(c resource.Context, cfg *istio.Config) {
-			if !c.Settings().EnableDualStack {
-				cfg.ControlPlaneValues = `
+			cfg.ControlPlaneValues = `
 values:
   pilot: 
     env: 
@@ -60,21 +59,6 @@ meshConfig:
     gatewayTopology:
       numTrustedProxies: 1 # Needed for X-Forwarded-For (See https://istio.io/latest/docs/ops/configuration/traffic-management/network-topologies/)
 `
-			} else {
-				cfg.ControlPlaneValues = `
-values:
-  pilot: 
-    env: 
-      PILOT_JWT_ENABLE_REMOTE_JWKS: true
-      ISTIO_DUAL_STACK: true
-meshConfig:
-  defaultConfig:
-    proxyMetadata:
-      ISTIO_DUAL_STACK: "true"
-    gatewayTopology:
-      numTrustedProxies: 1 # Needed for X-Forwarded-For (See https://istio.io/latest/docs/ops/configuration/traffic-management/network-topologies/)
-`
-			}
 		})).
 		// Create namespaces first. This way, echo can correctly configure egress to all namespaces.
 		SetupParallel(