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

Disable containerd from starting up at boot #8621

Merged
merged 1 commit into from
Jul 1, 2020

Conversation

afbjorklund
Copy link
Collaborator

@afbjorklund afbjorklund commented Jul 1, 2020

Saves us having to restart docker later on (see f2ea21a)

Tested with docker and with containerd runtimes

With the currently generated minikube.service, the default is to run with /run/docker/containerd/containerd.sock

It is only when containerd is explicitly selected (and not docker), that we want to use /run/containerd/containerd.sock

Note that it will just disable the containerd.service

There will still be a containerd process running...

Closes #8618

Saves us having to restart docker later on
@afbjorklund afbjorklund requested a review from medyagh July 1, 2020 16:36
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 1, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 1, 2020
@afbjorklund
Copy link
Collaborator Author

Disabling services is supposed to be done by the "distro"...

https://www.freedesktop.org/software/systemd/man/systemd.preset.html
https://www.freedesktop.org/wiki/Software/systemd/Preset/

Also fixed a warning, from the previous service installation.

Configuration file /home/anders/minikube/out/buildroot/output/target/usr/lib/systemd/system/containerd.service is marked executable. Please remove executable permission bits. Proceeding anyway.
Created symlink /home/anders/minikube/out/buildroot/output/target/etc/systemd/system/multi-user.target.wants/containerd.service → /usr/lib/systemd/system/containerd.service.

@afbjorklund
Copy link
Collaborator Author

@medyagh : this should avoid having to restart docker a second time

It will still be restarted explicitly after the preload, on purpose I believe ?

@medyagh medyagh merged commit c134ab8 into kubernetes:master Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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.

ensure docker restart happens only once
3 participants