Skip to content

K
k3s
Unverified Commit 4c9ad254 authored by Manuel Buil's avatar Manuel Buil Committed by GitHub
Browse files
Options

Fix dualStack test and change ipv6 network (#6023)

Signed-off-by: 's avatarManuel Buil <mbuil@suse.com>
parent 654d2b95
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
tests/e2e/dualstack/Vagrantfile
View file @ 4c9ad254
...@@ -8,7 +8,7 @@ RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "") ...@@ -8,7 +8,7 @@ RELEASE_VERSION = (ENV['E2E_RELEASE_VERSION'] || "")
NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i NODE_CPUS = (ENV['E2E_NODE_CPUS'] || 2).to_i
NODE_MEMORY = (ENV['E2E_NODE_MEMORY'] || 2048).to_i NODE_MEMORY = (ENV['E2E_NODE_MEMORY'] || 2048).to_i
NETWORK4_PREFIX = "10.10.10" NETWORK4_PREFIX = "10.10.10"
NETWORK6_PREFIX = "a11:decf:c0ff:ee" NETWORK6_PREFIX = "fd11:decf:c0ff:ee"
install_type = "" install_type = ""
def provision(vm, roles, role_num, node_num) def provision(vm, roles, role_num, node_num)
...@@ -50,6 +50,7 @@ def provision(vm, roles, role_num, node_num) ...@@ -50,6 +50,7 @@ def provision(vm, roles, role_num, node_num)
service-cidr: 10.43.0.0/16,2001:cafe:42:1::/112 service-cidr: 10.43.0.0/16,2001:cafe:42:1::/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
YAML YAML
k3s.env = ["K3S_KUBECONFIG_MODE=0644", install_type] k3s.env = ["K3S_KUBECONFIG_MODE=0644", install_type]
end end
...@@ -65,6 +66,7 @@ def provision(vm, roles, role_num, node_num) ...@@ -65,6 +66,7 @@ def provision(vm, roles, role_num, node_num)
cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56
service-cidr: 10.43.0.0/16,2001:cafe:42:1::/112 service-cidr: 10.43.0.0/16,2001:cafe:42:1::/112
flannel-iface: eth1 flannel-iface: eth1
kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695
YAML YAML
k3s.env = ["K3S_KUBECONFIG_MODE=0644", install_type] k3s.env = ["K3S_KUBECONFIG_MODE=0644", install_type]
end end
...@@ -79,6 +81,7 @@ def provision(vm, roles, role_num, node_num) ...@@ -79,6 +81,7 @@ def provision(vm, roles, role_num, node_num)
server: https://#{NETWORK4_PREFIX}.100:6443 server: https://#{NETWORK4_PREFIX}.100:6443
token: vagrant token: vagrant
flannel-iface: eth1 flannel-iface: eth1
kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695
YAML YAML
k3s.env = ["K3S_KUBECONFIG_MODE=0644", install_type] k3s.env = ["K3S_KUBECONFIG_MODE=0644", install_type]
end end
......
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