Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

bump up the default runtime to "io.containerd.runc.v2" #1359

Merged
merged 1 commit into from
Dec 17, 2019

Conversation

AkihiroSuda
Copy link
Member

The former default runtime "io.containerd.runc.v1" won't support new features
like support for cgroup v2: containerd/containerd#3726

Signed-off-by: Akihiro Suda akihiro.suda.cz@hco.ntt.co.jp

@AkihiroSuda
Copy link
Member Author

/test pull-cri-containerd-windows-cri

@AkihiroSuda
Copy link
Member Author

/test pull-cri-containerd-node-e2e

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comments...

docs/config.md Show resolved Hide resolved
docs/config.md Show resolved Hide resolved
@mikebrow
Copy link
Member

@jterry75 @Random-Liu thoughts on PRs that hit _unix isms. As a general rule, should we try to shadow/pair another PR to do the windows equivalent changes or make suggestions for the windows equivalent in the PR if amenable/doable.

@Random-Liu
Copy link
Member

We need to make sure the Docker and containerd packages on OS distributions contain the new shim binary.

@mikebrow
Copy link
Member

We need to make sure the Docker and containerd packages on OS distributions contain the new shim binary.

Would be nice if we had an official line of communication for the distributions, where we could get feedback / verification.

@AkihiroSuda
Copy link
Member Author

I think we can just mention that in v1.4 release note.

@AkihiroSuda
Copy link
Member Author

@mikebrow Windows stuff is unrelated to this PR. Windows doesn't use io.containerd.runc.v%d.

@mikebrow
Copy link
Member

mikebrow commented Dec 13, 2019

@mikebrow Windows stuff is unrelated to this PR. Windows doesn't use io.containerd.runc.v%d.

ok removed that comment.. will address the windows config docs elsewhere.

@mikebrow
Copy link
Member

I think we can just mention that in v1.4 release note.

true...still would be nice to give them a heads up if they are not watching master changes.

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

just nits on the docs can handle them in a followup

The former default runtime "io.containerd.runc.v1" won't support new features
like support for cgroup v2: containerd/containerd#3726

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Copy link
Member Author

updated docs

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Dec 16, 2019

We need to make sure the Docker and containerd packages on OS distributions contain the new shim binary.

cc @thaJeztah Who is maintaining Docker containerd.io package?

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member

cc @thaJeztah Who is maintaining Docker containerd.io package?

I can have a look at that one; plan was to open-source the repo soon (think there's one remaining PR for that)

@@ -298,7 +298,7 @@ func (c *criService) cleanupSandboxFiles(id string, config *runtime.PodSandboxCo
func (c *criService) taskOpts(runtimeType string) []containerd.NewTaskOpts {
// TODO(random-liu): Remove this after shim v1 is deprecated.
var taskOpts []containerd.NewTaskOpts
if c.config.NoPivot && runtimeType == plugin.RuntimeRuncV1 {
if c.config.NoPivot && (runtimeType == plugin.RuntimeRuncV1 || runtimeType == plugin.RuntimeRuncV2) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may want to cherry-pick this part into 1.3.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, PR: #1360

@Random-Liu
Copy link
Member

/lgtm

@Random-Liu Random-Liu merged commit ff8a2e7 into containerd:master Dec 17, 2019
AkihiroSuda added a commit to AkihiroSuda/cri-containerd that referenced this pull request Dec 18, 2019
Partially cherry-pick aaddaa2 (containerd#1359)

containerd#1359 (comment)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants