From b1c369981684733bd93de36697764bcde1b97311 Mon Sep 17 00:00:00 2001 From: Faseela K Date: Mon, 13 Jan 2025 21:27:45 +0100 Subject: [PATCH 1/2] Introduce IP_FAMILIES for integration tests Signed-off-by: Faseela K --- prow/config/jobs/istio.io.yaml | 4 ++++ prow/config/jobs/istio.yaml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/prow/config/jobs/istio.io.yaml b/prow/config/jobs/istio.io.yaml index 873f9d76bb..bb62507328 100644 --- a/prow/config/jobs/istio.io.yaml +++ b/prow/config/jobs/istio.io.yaml @@ -53,8 +53,12 @@ jobs: env: - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + # IP_FAMILY is to be replaced by IP_FAMILIES fully, + # temporarily retaining it until https://github.com/istio/istio/pull/54421 is merged. - name: IP_FAMILY value: "dual" + - name: IP_FAMILIES + value: "IPv4,IPv6" regex: ^(go.mod$|tests/|pkg/test/|prow/|content/en/boilerplates/snips/|content/en/docs/.*(test\.sh|/snips\.sh)$) - name: update-ref-docs-dry-run diff --git a/prow/config/jobs/istio.yaml b/prow/config/jobs/istio.yaml index dad8f1006f..e17964a713 100644 --- a/prow/config/jobs/istio.yaml +++ b/prow/config/jobs/istio.yaml @@ -117,8 +117,12 @@ jobs: env: - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + # IP_FAMILY is to be replaced by IP_FAMILIES fully, + # temporarily retaining it until https://github.com/istio/istio/pull/54421 is merged. - name: IP_FAMILY value: "ipv6" + - name: IP_FAMILIES + value: "IPv6" - name: integ-ds command: [entrypoint, prow/integ-suite-kind.sh, test.integration.kube.environment] @@ -126,8 +130,12 @@ jobs: env: - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + # IP_FAMILY is to be replaced by IP_FAMILIES fully, + # temporarily retaining it until https://github.com/istio/istio/pull/54421 is merged. - name: IP_FAMILY value: "dual" + - name: IP_FAMILIES + value: "IPv4,IPv6" - name: integ-basic architectures: [arm64] @@ -242,8 +250,12 @@ jobs: value: " --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient " - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + # IP_FAMILY is to be replaced by IP_FAMILIES fully, + # temporarily retaining it until https://github.com/istio/istio/pull/54421 is merged. - name: IP_FAMILY value: "ipv6" + - name: IP_FAMILIES + value: "IPv6" command: - entrypoint - prow/integ-suite-kind.sh @@ -260,8 +272,12 @@ jobs: value: " --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient " - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + # IP_FAMILY is to be replaced by IP_FAMILIES fully, + # temporarily retaining it until https://github.com/istio/istio/pull/54421 is merged. - name: IP_FAMILY value: "dual" + - name: IP_FAMILIES + value: "IPv4,IPv6" command: - entrypoint - prow/integ-suite-kind.sh From ce1ef0906f817eed62f2d87003918a6208c3ee47 Mon Sep 17 00:00:00 2001 From: Faseela K Date: Tue, 14 Jan 2025 11:41:56 +0100 Subject: [PATCH 2/2] make gen Signed-off-by: Faseela K --- .../istio-private.istio.io.master.gen.yaml | 4 ++++ .../istio/istio-private.istio.master.gen.yaml | 16 ++++++++++++++++ .../istio.io/istio.istio.io.master.gen.yaml | 4 ++++ .../jobs/istio/istio/istio.istio.master.gen.yaml | 16 ++++++++++++++++ .../istio/istio/istio.istioexperimental.gen.yaml | 8 ++++++++ 5 files changed, 48 insertions(+) diff --git a/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml b/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml index 15eeed6c84..83dc529118 100644 --- a/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml +++ b/prow/cluster/jobs/istio-private/istio.io/istio-private.istio.io.master.gen.yaml @@ -25,6 +25,8 @@ postsubmits: value: "true" - name: GOMAXPROCS value: "8" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual image: gcr.io/istio-testing/build-tools:master-18659ab5deb644ab728206113deffe161b181dbf @@ -564,6 +566,8 @@ presubmits: value: "true" - name: GOMAXPROCS value: "8" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual image: gcr.io/istio-testing/build-tools:master-18659ab5deb644ab728206113deffe161b181dbf diff --git a/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml b/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml index 563a2cfedd..f0232629e5 100644 --- a/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml +++ b/prow/cluster/jobs/istio-private/istio/istio-private.istio.master.gen.yaml @@ -117,6 +117,8 @@ postsubmits: value: "5" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: DEPENDENCIES @@ -208,6 +210,8 @@ postsubmits: value: "5" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: DEPENDENCIES @@ -731,6 +735,8 @@ postsubmits: value: "true" - name: GOMAXPROCS value: "5" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: DEPENDENCIES @@ -901,6 +907,8 @@ postsubmits: value: "true" - name: GOMAXPROCS value: "5" + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: DEPENDENCIES @@ -3437,6 +3445,8 @@ presubmits: value: "5" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: DEPENDENCIES @@ -3532,6 +3542,8 @@ presubmits: value: "5" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: DEPENDENCIES @@ -4070,6 +4082,8 @@ presubmits: value: "true" - name: GOMAXPROCS value: "5" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: DEPENDENCIES @@ -4246,6 +4260,8 @@ presubmits: value: "true" - name: GOMAXPROCS value: "5" + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: DEPENDENCIES diff --git a/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml b/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml index cfed1ae745..2e884ea3ce 100644 --- a/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml +++ b/prow/cluster/jobs/istio/istio.io/istio.istio.io.master.gen.yaml @@ -147,6 +147,8 @@ postsubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS @@ -684,6 +686,8 @@ presubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS diff --git a/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml b/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml index 4aaa7a4275..7bb9a3d19d 100644 --- a/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml +++ b/prow/cluster/jobs/istio/istio/istio.istio.master.gen.yaml @@ -407,6 +407,8 @@ postsubmits: value: "true" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS @@ -480,6 +482,8 @@ postsubmits: value: "true" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: GOMAXPROCS @@ -896,6 +900,8 @@ postsubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS @@ -1030,6 +1036,8 @@ postsubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: GOMAXPROCS @@ -3017,6 +3025,8 @@ presubmits: value: "true" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS @@ -3092,6 +3102,8 @@ presubmits: value: "true" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: GOMAXPROCS @@ -3511,6 +3523,8 @@ presubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS @@ -3647,6 +3661,8 @@ presubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: GOMAXPROCS diff --git a/prow/cluster/jobs/istio/istio/istio.istioexperimental.gen.yaml b/prow/cluster/jobs/istio/istio/istio.istioexperimental.gen.yaml index 4ee19fdac8..bf2e7e1ea4 100644 --- a/prow/cluster/jobs/istio/istio/istio.istioexperimental.gen.yaml +++ b/prow/cluster/jobs/istio/istio/istio.istioexperimental.gen.yaml @@ -323,6 +323,8 @@ presubmits: value: "true" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS @@ -398,6 +400,8 @@ presubmits: value: "true" - name: INTEGRATION_TEST_FLAGS value: ' --istio.test.kube.helm.values=cni.ambient.ipv6=true --istio.test.ambient ' + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: GOMAXPROCS @@ -817,6 +821,8 @@ presubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv4,IPv6 - name: IP_FAMILY value: dual - name: GOMAXPROCS @@ -953,6 +959,8 @@ presubmits: value: "0" - name: DOCKER_IN_DOCKER_IPV6_ENABLED value: "true" + - name: IP_FAMILIES + value: IPv6 - name: IP_FAMILY value: ipv6 - name: GOMAXPROCS