github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix overlapping address range 

Signed-off-by: Manuel Buil <mbuil@suse.com>
release-1.25
Manuel Buil 2023-11-20 08:25:25 +01:00 committed by Brad Davidson
parent aa66de382c
commit a8949212ed
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/e2e/dualstack/Vagrantfile vendored
View File

@ -45,8 +45,8 @@ def provision(vm, role, role_num, node_num)
node-ip: #{node_ip4},#{node_ip6} node-ip: #{node_ip4},#{node_ip6}
cluster-init: true cluster-init: true
token: vagrant token: vagrant
cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 cluster-cidr: 10.42.0.0/16,2001:cafe:42::/56
service-cidr: 10.43.0.0/16,2001:cafe:42:1::/112 service-cidr: 10.43.0.0/16,2001:cafe:43::/112
bind-address: #{NETWORK4_PREFIX}.100 bind-address: #{NETWORK4_PREFIX}.100
flannel-iface: eth1 flannel-iface: eth1
kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695 kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695
@ -62,8 +62,8 @@ def provision(vm, role, role_num, node_num)
node-ip: #{node_ip4},#{node_ip6} node-ip: #{node_ip4},#{node_ip6}
server: https://#{NETWORK4_PREFIX}.100:6443 server: https://#{NETWORK4_PREFIX}.100:6443
token: vagrant token: vagrant
cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 cluster-cidr: 10.42.0.0/16,2001:cafe:42::/56
service-cidr: 10.43.0.0/16,2001:cafe:42:1::/112 service-cidr: 10.43.0.0/16,2001:cafe:43::/112
flannel-iface: eth1 flannel-iface: eth1
kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695 kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695
YAML YAML

4
tests/integration/dualstack/dualstack_int_test.go
View File

@ -13,8 +13,8 @@ import (
var dualStackServer *testutil.K3sServer var dualStackServer *testutil.K3sServer
var dualStackServerArgs = []string{ var dualStackServerArgs = []string{
"--cluster-init", "--cluster-init",
"--cluster-cidr", "10.42.0.0/16,2001:cafe:42:0::/56", "--cluster-cidr", "10.42.0.0/16,2001:cafe:42::/56",
"--service-cidr", "10.43.0.0/16,2001:cafe:42:1::/112", "--service-cidr", "10.43.0.0/16,2001:cafe:43::/112",
"--disable-network-policy", "--disable-network-policy",
} }
var testLock int var testLock int