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

Temporarily use containerd from Docker packages #9346

Merged
merged 1 commit into from
Jun 19, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Jun 12, 2020

Docker builds the containerd binaries differently than containerd does.
This makes possible some things like enabling SELinux, which otherwise as described in #9334 (comment).

Using containerd from the docker packages should ensure better compatibility.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 12, 2020
@hakman hakman force-pushed the containerd-docker-packages branch from de39a23 to 2ae373a Compare June 12, 2020 04:45
@justinsb
Copy link
Member

My knee-jerk reaction is that we should stick to the community packages; I was very happy with the work you did that reduced our dependencies on the docker.com packages, as they've bitten us repeatedly in the past.

Is there a containerd issue tracking the selinux issue?

@hakman
Copy link
Member Author

hakman commented Jun 12, 2020

@justinsb I was quite happy with that also and would like to keep the same direction in the future.
I think the issue here is containerd/containerd#4183, which was not cherry-picked to release branches.

@hakman
Copy link
Member Author

hakman commented Jun 12, 2020

@justinsb I created some PRs to address this in future releases, and change again to the community packages. Do you think it's ok to switch to Docker packages until then?
containerd/containerd#4318
containerd/containerd#4319

@hakman hakman force-pushed the containerd-docker-packages branch 3 times, most recently from c5f8822 to 391caf8 Compare June 15, 2020 03:28
@hakman hakman changed the title Use containerd from Docker packages when possible Temporarily use containerd from Docker packages Jun 15, 2020
@hakman hakman force-pushed the containerd-docker-packages branch from 391caf8 to 0d44644 Compare June 15, 2020 03:29
@hakman
Copy link
Member Author

hakman commented Jun 15, 2020

Both PRs for containerd were accepted and next release will be built with SELinux support.
As is, this change will just use Docker temporarily and should be reverted once a new version of containerd is released.

@justinsb any objections?

@hakman hakman force-pushed the containerd-docker-packages branch from 0d44644 to 219a2ae Compare June 19, 2020 15:27
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 19, 2020
@rifelpet
Copy link
Member

As discussed during office hours, we decided this is acceptable for a temporary solution until the next containerd release 👍
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 19, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, rifelpet

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 Jun 19, 2020
@k8s-ci-robot k8s-ci-robot merged commit d5f0d6a into kubernetes:master Jun 19, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jun 19, 2020
@hakman hakman deleted the containerd-docker-packages branch July 1, 2020 03:12
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. area/nodeup cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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