From 33d5b44af39dbffe28977acd3ad6aab7088f9e23 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Tue, 2 Jul 2024 16:18:21 +0200 Subject: [PATCH] Update Vagrantfile of a few e2e tests Signed-off-by: Manuel Buil (cherry picked from commit 9684c2528a1b65cd53e8af43fea27dc2ad2b74c4) Signed-off-by: Brad Davidson --- tests/e2e/ciliumnokp/Vagrantfile | 1 - tests/e2e/dnscache/Vagrantfile | 2 -- tests/e2e/dualstack/Vagrantfile | 2 -- tests/e2e/multus/Vagrantfile | 1 - 4 files changed, 6 deletions(-) diff --git a/tests/e2e/ciliumnokp/Vagrantfile b/tests/e2e/ciliumnokp/Vagrantfile index 607cb45dfd..0d54cf5300 100644 --- a/tests/e2e/ciliumnokp/Vagrantfile +++ b/tests/e2e/ciliumnokp/Vagrantfile @@ -48,7 +48,6 @@ def provision(vm, roles, role_num, node_num) token: vagrant-rke2 cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 service-cidr: 10.43.0.0/16,2001:cafe:43:0::/112 - bind-address: #{NETWORK4_PREFIX}.100 cni: cilium disable-kube-proxy: true YAML diff --git a/tests/e2e/dnscache/Vagrantfile b/tests/e2e/dnscache/Vagrantfile index 6d650b45d7..ce0eb0bc0a 100644 --- a/tests/e2e/dnscache/Vagrantfile +++ b/tests/e2e/dnscache/Vagrantfile @@ -47,9 +47,7 @@ def provision(vm, roles, role_num, node_num) token: vagrant-rke2 cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 service-cidr: 10.43.0.0/16,2001:cafe:43:0::/112 - bind-address: #{NETWORK4_PREFIX}.100 cni: #{CNI} - kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695 YAML end end diff --git a/tests/e2e/dualstack/Vagrantfile b/tests/e2e/dualstack/Vagrantfile index e7b11d61c8..36cf1867a4 100644 --- a/tests/e2e/dualstack/Vagrantfile +++ b/tests/e2e/dualstack/Vagrantfile @@ -50,9 +50,7 @@ def provision(vm, roles, role_num, node_num) token: vagrant-rke2 cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 service-cidr: 10.43.0.0/16,2001:cafe:43:0::/112 - bind-address: #{NETWORK4_PREFIX}.100 cni: #{CNI} - kubelet-arg: "--node-ip=0.0.0.0" # Workaround for https://github.com/kubernetes/kubernetes/issues/111695 YAML end elsif roles.include?("server") && role_num != 0 diff --git a/tests/e2e/multus/Vagrantfile b/tests/e2e/multus/Vagrantfile index 84bfadaae5..2ffa5e5fad 100644 --- a/tests/e2e/multus/Vagrantfile +++ b/tests/e2e/multus/Vagrantfile @@ -48,7 +48,6 @@ def provision(vm, roles, role_num, node_num) token: vagrant-rke2 cluster-cidr: 10.42.0.0/16,2001:cafe:42:0::/56 service-cidr: 10.43.0.0/16,2001:cafe:43:0::/112 - bind-address: #{NETWORK4_PREFIX}.100 cni: #{CNI} YAML end