Merge pull request #4323 from josedonizetti/fix-kvm-ensure-network

kvm2: Add support for --kvm-network to ensureNetwork
kubernetes · May 24, 2019 · bb56fd2 · bb56fd2
2 parents 07aba0f + c7bace6
commit bb56fd2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/drivers/kvm/network.go b/pkg/drivers/kvm/network.go
@@ -89,10 +89,9 @@ func (d *Driver) ensureNetwork() error {
 
 	// network: default
 
-	// Start the default network
 	// It is assumed that the libvirt/kvm installation has already created this network
-	log.Infof("Ensuring network %s is active", defaultNetworkName)
-	if err := setupNetwork(conn, defaultNetworkName); err != nil {
+	log.Infof("Ensuring network %s is active", d.Network)
+	if err := setupNetwork(conn, d.Network); err != nil {
 		return err
 	}
 

diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
@@ -38,6 +38,9 @@ func TestStartStop(t *testing.T) {
 		{"nocache_oldest", []string{
 			"--cache-images=false",
 			fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion),
+			// default is the network created by libvirt, if we change the name minikube won't boot
+			// because the given network doesn't exist
+			"--kvm-network=default",
 		}},
 		{"feature_gates_newest_cni", []string{
 			"--feature-gates",