Only restart docker service if container runtime is docker #3426
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
December 6, 2018 16:01
Only allow the buildroot provisioner to restart docker if the container runtime is docker. This change should fix the bug in kubernetes#3424, since now docker will not be restarted if the container runtime is containerd.
…tables precheck error From this issue: kubernetes/kubeadm#1062 these files need to be added to prevent this precheck error (which occurs when running any container runtime that isn't docker). Also, save the machine config on the user's filesystem earlier so that the buildprovisioner can access it.
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: priyawadhwa If they are not already assigned, you can assign the PR to them by writing 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 |
k8s-ci-robot
added
the
size/M
balopat
added
the
lgtm
priyawadhwa
pushed a commit
to priyawadhwa/minikube
that referenced
this pull request
Dec 13, 2018
In PR kubernetes#3426, I changed "minikube start" to overwrite the cluster config earlier so that the container runtime could be extracted from it by the buildroot provisioner. This introduced a bug later on, where minikube expected to read the kubernetes version from theold config (which no longer existed, because the config was overwritten). To fix this, I changed the code to store the old version of the config in memory before overwriting it. This should fix kubernetes#3447
balopat
pushed a commit
that referenced
this pull request
Dec 13, 2018
* Save old cluster config in memory before overwriting In PR #3426, I changed "minikube start" to overwrite the cluster config earlier so that the container runtime could be extracted from it by the buildroot provisioner. This introduced a bug later on, where minikube expected to read the kubernetes version from theold config (which no longer existed, because the config was overwritten). To fix this, I changed the code to store the old version of the config in memory before overwriting it. This should fix #3447
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only allow the buildroot provisioner to restart docker if the container
runtime is docker. This change should fix the bug in #3424, since now
docker will not be restarted if the container runtime is containerd.
Also, Added files to fix FileContent--proc-sys-net-bridge-bridge-nf-call-ip-tables precheck error. From this issue: kubernetes/kubeadm#1062
these files need to be added to prevent this precheck error (which occurs when running any container runtime that isn't docker).