Skip to content

K
k3s
Commit a8949212 authored by Manuel Buil's avatar Manuel Buil Committed by Brad Davidson
Browse files
Options

Fix overlapping address range

Signed-off-by: 's avatarManuel Buil <mbuil@suse.com>
parent aa66de38
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
tests/e2e/dualstack/Vagrantfile
View file @ a8949212
...@@ -45,8 +45,8 @@ def provision(vm, role, role_num, node_num) ...@@ -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) ...@@ -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
......
tests/integration/dualstack/dualstack_int_test.go
View file @ a8949212
...@@ -13,8 +13,8 @@ import ( ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment