Merge pull request #7758 from manuelbuil/removeLibvirtLines125

[Release 1.25] Remove unused libvirt config
k3s-io · Jun 13, 2023 · 4e1ba3a · 4e1ba3a
2 parents c65dd08 + 21a7f5c
commit 4e1ba3a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/tests/e2e/dualstack/Vagrantfile b/tests/e2e/dualstack/Vagrantfile
@@ -21,8 +21,6 @@ def provision(vm, roles, role_num, node_num)
   vm.network "private_network", 
     :ip => node_ip4,
     :netmask => "255.255.255.0",
-    :libvirt__dhcp_enabled => false,
-    :libvirt__forward_mode => "none",
     :libvirt__guest_ipv6 => "yes",
     :libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
     :libvirt__ipv6_prefix => "64"

diff --git a/tests/e2e/externalip/Vagrantfile b/tests/e2e/externalip/Vagrantfile
@@ -16,16 +16,8 @@ def provision(vm, roles, role_num, node_num)
   vm.hostname = "#{roles[0]}-#{role_num}"
   node_ip4 = "#{NETWORK4_PREFIX}.#{100+node_num}"
   node_ip4_public = "#{PUBLIC_NETWORK4_PREFIX}.#{100+node_num}"
-  vm.network "private_network", 
-    :ip => node_ip4,
-    :netmask => "255.255.255.0",
-    :libvirt__dhcp_enabled => false,
-    :libvirt__forward_mode => "none"
-  vm.network "private_network", 
-    :ip => node_ip4_public,
-    :netmask => "255.255.255.0",
-    :libvirt__dhcp_enabled => false,
-    :libvirt__forward_mode => "none"
+  vm.network "private_network", :ip => node_ip4, :netmask => "255.255.255.0"
+  vm.network "private_network", :ip => node_ip4_public, :netmask => "255.255.255.0"
 
   scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" 
   vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"

diff --git a/tests/e2e/multiclustercidr/Vagrantfile b/tests/e2e/multiclustercidr/Vagrantfile
@@ -22,8 +22,6 @@ def provision(vm, roles, role_num, node_num)
   vm.network "private_network",
     :ip => node_ip4,
     :netmask => "255.255.255.0",
-    :libvirt__dhcp_enabled => false,
-    :libvirt__forward_mode => "none",
     :libvirt__guest_ipv6 => "yes",
     :libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
     :libvirt__ipv6_prefix => "64"

diff --git a/tests/e2e/validatecluster/validatecluster_test.go b/tests/e2e/validatecluster/validatecluster_test.go
@@ -345,6 +345,7 @@ var _ = Describe("Verify Create", Ordered, func() {
 			var expectResult = []string{"client-ca.crt",
 				"client-ca.key",
 				"client-ca.nochain.crt",
+				"client-supervisor.crt", "client-supervisor.key",
 				"dynamic-cert.json", "peer-ca.crt",
 				"peer-ca.key", "server-ca.crt",
 				"server-ca.key", "request-header-ca.crt",