From d34550fb2faae6c8d59dd6204ea1c357974fca44 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 20 Nov 2023 08:25:25 +0100 Subject: [PATCH] Fix overlapping address range Signed-off-by: Manuel Buil --- tests/e2e/dualstack/Vagrantfile | 8 ++++---- tests/integration/dualstack/dualstack_int_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/e2e/dualstack/Vagrantfile b/tests/e2e/dualstack/Vagrantfile index 558ca89399..2b31bfb0e9 100644 --- a/tests/e2e/dualstack/Vagrantfile +++ b/tests/e2e/dualstack/Vagrantfile @@ -46,8 +46,8 @@ def provision(vm, role, role_num, node_num) node-ip: #{node_ip4},#{node_ip6} cluster-init: true token: vagrant - cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 - service-cidr: 10.43.0.0/16,2001:cafe:42:1::/112 + cluster-cidr: 10.42.0.0/16,2001:cafe:42::/56 + service-cidr: 10.43.0.0/16,2001:cafe:43::/112 bind-address: #{NETWORK4_PREFIX}.100 flannel-iface: eth1 YAML @@ -62,8 +62,8 @@ def provision(vm, role, role_num, node_num) node-ip: #{node_ip4},#{node_ip6} server: https://#{NETWORK4_PREFIX}.100:6443 token: vagrant - cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 - service-cidr: 10.43.0.0/16,2001:cafe:42:1::/112 + cluster-cidr: 10.42.0.0/16,2001:cafe:42::/56 + service-cidr: 10.43.0.0/16,2001:cafe:43::/112 flannel-iface: eth1 YAML k3s.env = ["K3S_KUBECONFIG_MODE=0644", install_type] diff --git a/tests/integration/dualstack/dualstack_int_test.go b/tests/integration/dualstack/dualstack_int_test.go index c0b2c18f41..4d54edc0e6 100644 --- a/tests/integration/dualstack/dualstack_int_test.go +++ b/tests/integration/dualstack/dualstack_int_test.go @@ -13,8 +13,8 @@ import ( var dualStackServer *testutil.K3sServer var dualStackServerArgs = []string{ "--cluster-init", - "--cluster-cidr", "10.42.0.0/16,2001:cafe:42:0::/56", - "--service-cidr", "10.43.0.0/16,2001:cafe:42:1::/112", + "--cluster-cidr", "10.42.0.0/16,2001:cafe:42::/56", + "--service-cidr", "10.43.0.0/16,2001:cafe:43::/112", "--disable-network-policy", } var testLock int