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

Only restart docker service if container runtime is docker #3426

Merged
merged 2 commits into from
Dec 7, 2018
Merged

Only restart docker service if container runtime is docker #3426

merged 2 commits into from
Dec 7, 2018

Commits on Dec 7, 2018

  1. Only restart docker service if container runtime is docker 

    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.
    Priya Wadhwa committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    7a1c0b1 View commit details
    Browse the repository at this point in the history

  2. 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).

Also, save the machine config on the user's filesystem earlier so that the buildprovisioner can access it.
    Priya Wadhwa committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    59c43c7 View commit details
    Browse the repository at this point in the history