Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kvm2: Add support for --kvm-network to ensureNetwork #4323

Merged
merged 5 commits into from
May 24, 2019
Merged

kvm2: Add support for --kvm-network to ensureNetwork #4323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3bf4bd
Fix kvm ensureNetwork
josedonizetti May 22, 2019
93329f1
Remove obsolete comment
josedonizetti May 22, 2019
5d02839
Add integration test to flag --kvm-network
josedonizetti May 22, 2019
a20d789
Improve --kvm-network integration test
josedonizetti May 22, 2019
c7bace6
Fix --kvm-network integration test
josedonizetti May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pkg/drivers/kvm/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
3 changes: 3 additions & 0 deletions test/integration/start_stop_delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
tstromberg marked this conversation as resolved.
Show resolved Hide resolved
}},
{"feature_gates_newest_cni", []string{
"--feature-gates",
Expand Down