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

--extra-config now work for kubeadm as well #3879

Merged
merged 5 commits into from Mar 22, 2019

Conversation

Projects
None yet
5 participants
@marcosdiez
Copy link
Contributor

marcosdiez commented Mar 14, 2019

This small patch allows us to use --extra-config also with kubeadm.

My primary motivation is to run minikube with the none vm driver in any version of docker.

This patch allows one to do so like this: sudo -E minikube start --vm-driver=none --kubernetes-version v1.11.8 --extra-config kubeadm.ignore-preflight-errors=SystemVerification

@minikube-bot

This comment has been minimized.

Copy link
Collaborator

minikube-bot commented Mar 14, 2019

Can one of the admins verify this patch?

@afbjorklund

This comment has been minimized.

Copy link
Contributor

afbjorklund commented Mar 14, 2019

This is quite a convoluted syntax for the check, and it seems that it is duplicating the preflight checks in two different places now. Can see the reason for skipping Docker version check (surely they will name the next version something weird and break it again), but supporting generic parameters to kubeadm might be hard to do. Would rather see something more specific to SystemVerification at this point in time.

@afbjorklund afbjorklund requested a review from tstromberg Mar 14, 2019

@marcosdiez

This comment has been minimized.

Copy link
Contributor Author

marcosdiez commented Mar 18, 2019

hey, @afbjorklund !

An alternative for my generic approach would be similar to what was implemented here: #3892

The problem with that implementation is that minikube will one day become a mess if we start exposing each and every parameter from other tools to it. Also, my approach is future compatible.

That being said, I am neutral to how this get's implemented as long as I can tell minikube to tell kubeadm not to complain about docker versions.
So if you tell me that you prefer the other way, I can implement that as well.

Please tell me if I can help you in any other way!
Marcos

@tstromberg

This comment has been minimized.

Copy link
Contributor

tstromberg commented Mar 21, 2019

If you add an example command-line to start_stop_delete_test.go, I'd be good to merge this.

marcosdiez added some commits Mar 13, 2019

allow --extra-config work on kubeadm as well. example: --extra-config…
… kubeadm.ignore-preflight-errors=SystemVerification

missing variable
start_stop_delete_test.go now tests for "--extra-config kubeadm.ignor…
…e-preflight-errors=SystemVerification" too

@marcosdiez marcosdiez force-pushed the marcosdiez:extra_config_for_kubeadm branch from 0b3e08d to 8aec728 Mar 21, 2019

@marcosdiez

This comment has been minimized.

Copy link
Contributor Author

marcosdiez commented Mar 21, 2019

Hi @tstromberg !
I just added the extra line on start_stop_delete_test.go to test this.

And since travis does not do integration tests, here is my passing output:
https://gist.github.com/marcosdiez/88e029d2068cf349c1daa1fa97585ff9

This is the command I used to run the tests:
env TEST_ARGS="-minikube-start-args=--vm-driver=none -test.run TestStartStop" sudo -E make integration

(I must use --vm-driver=none because I run linux inside of a VM, so other vm drivers are not an option to me)

@tstromberg

This comment has been minimized.

Copy link
Contributor

tstromberg commented Mar 21, 2019

@minikube-bot OK to test

@tstromberg

This comment has been minimized.

Copy link
Contributor

tstromberg commented Mar 21, 2019

/lgtm

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Mar 21, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marcosdiez, tstromberg

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

@tstromberg

This comment has been minimized.

Copy link
Contributor

tstromberg commented Mar 21, 2019

@minikube-bot OK to test

@tstromberg tstromberg merged commit cbac94a into kubernetes:master Mar 22, 2019

6 of 10 checks passed

Linux-KVM Jenkins
Details
Linux-None Jenkins
Details
Linux-Virtualbox Jenkins
Details
tide Not mergeable. Job Jenkins Cross Build has not succeeded.
Details
Jenkins Cross Build Build finished. No test results found.
Details
Linux-VirtualBox Jenkins
Details
OSX-Hyperkit Jenkins
Details
OSX-Virtualbox Jenkins
Details
cla/linuxfoundation marcosdiez authorized
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.