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.

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

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

Merged
merged 5 commits into from
May 24, 2019

Conversation

josedonizetti
Copy link
Member

kvm ensureNetwork is directly checking for the constant defaultNetworkName which is a problem when a user is passing a custom network through the option --kvm-network.

Kvm drivers pass the Network to be the same as the flag --kvm-network.
https://github.com/kubernetes/minikube/blob/master/pkg/minikube/drivers/kvm/driver.go#L67
https://github.com/kubernetes/minikube/blob/master/pkg/minikube/drivers/kvm2/driver.go#L67

Even the default Host creation sets up the Network:
https://github.com/kubernetes/minikube/blob/master/pkg/drivers/kvm/kvm.go#L107

The PR changes ensureNetwork to use the given network instead of hardcoded constant.

@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@tstromberg tstromberg changed the title Fix kvm ensureNetwork kvm2: Add support for --kvm-network to ensureNetwork May 22, 2019
Copy link
Contributor

@tstromberg tstromberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So that we don't break this in the future, do you mind adding --kvm-network to our integration tests?

I recommend adding it to the list of flags tested by the nocache_oldest subtest within start_stop_delete_test.go, as the integration test latency is already ridiculously high. Thank you!

@@ -91,8 +91,8 @@ func (d *Driver) ensureNetwork() error {

// Start the default network
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove obsolete comment. The logging messages tell enough of a story.

@tstromberg
Copy link
Contributor

@minikube-bot OK to test

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 22, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @josedonizetti. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: josedonizetti
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: sharifelgamal

If they are not already assigned, you can assign the PR to them by writing /assign @sharifelgamal in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 22, 2019
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 22, 2019
@josedonizetti
Copy link
Member Author

@tstromberg Let me know if I got the integration test correct (unfortunately they break locally even without my change). Also, do you want me to squash the commits into one?

@tstromberg
Copy link
Contributor

@tstromberg Let me know if I got the integration test correct (unfortunately they break locally even without my change). Also, do you want me to squash the commits into one?

No need to squash. I'm curious though about the local breakage - what are you seeing?

Change the network to test-net to avoid conflicts.
@josedonizetti
Copy link
Member Author

josedonizetti commented May 22, 2019

@tstromberg The integration tests are running now. Seems the tests I did with the --kvm-network left the minikube/kvm in a bad state, which wasn't allowing a start and breaking the tests, not even start it on the cmd directly was working, after removing the kvm domain by hand, it passed.

I'll investigate this a little bit more, and try to address in a separate PR.

@josedonizetti
Copy link
Member Author

@tstromberg Builds for KVM, and VirtualBox never returned? It seems none build is breaking elsewhere as well.

@tstromberg
Copy link
Contributor

@minikube-bot OK to test

FYI - the none failure is #4339

@tstromberg tstromberg merged commit bb56fd2 into kubernetes:master May 24, 2019
@josedonizetti josedonizetti deleted the fix-kvm-ensure-network branch May 24, 2019 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants