Skip to content

shows our runc.v2 default options#5302

Merged
fuweid merged 2 commits intocontainerd:masterfrom
mikebrow:toml-cri-defaults
Apr 9, 2021
Merged

shows our runc.v2 default options#5302
fuweid merged 2 commits intocontainerd:masterfrom
mikebrow:toml-cri-defaults

Conversation

@mikebrow
Copy link
Copy Markdown
Member

@mikebrow mikebrow commented Apr 2, 2021 •
edited
Loading

When running the containerd default config command this pr adds output to show the available runc options:

      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]

        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
          base_runtime_spec = ""
          container_annotations = []
          pod_annotations = []
          privileged_without_host_devices = false
          runtime_engine = ""
          runtime_root = ""
          runtime_type = "io.containerd.runc.v2"

          [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
            BinaryName = ""
            CriuImagePath = ""
            CriuPath = ""
            CriuWorkPath = ""
            IoGid = 0
            IoUid = 0
            NoNewKeyring = false
            NoPivotRoot = false
            Root = ""
            ShimCgroup = ""
            SystemdCgroup = false

and here's the containerd default dump output with just SystemdCgroup = false set

        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
          base_runtime_spec = ""
          container_annotations = []
          pod_annotations = []
          privileged_without_host_devices = false
          runtime_engine = ""
          runtime_root = ""
          runtime_type = "io.containerd.runc.v2"

          [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
            SystemdCgroup = false

these map to the docs here:

Signed-off-by: Mike Brown [email protected]

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 2, 2021

Build succeeded.

dims
dims approved these changes Apr 2, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

Thanks @mikebrow this helps a lot!

Zyqsempai
Zyqsempai approved these changes Apr 2, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow added this to the 1.5 milestone Apr 2, 2021
@mikebrow mikebrow force-pushed the toml-cri-defaults branch from bc192de to 5028ba3 Compare April 7, 2021 01:43
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 7, 2021

Build succeeded.

@mikebrow mikebrow force-pushed the toml-cri-defaults branch from 5028ba3 to d77acde Compare April 7, 2021 16:07
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 7, 2021

Build succeeded.

@mikebrow mikebrow force-pushed the toml-cri-defaults branch from d77acde to 63abb3a Compare April 7, 2021 17:34
@mikebrow
Copy link
Copy Markdown
Member Author

mikebrow commented Apr 7, 2021

rebased to test on re-enabled cri test

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 7, 2021

Build succeeded.

@mikebrow mikebrow requested review from AkihiroSuda and dmcgowan April 8, 2021 15:12
@mikebrow
Copy link
Copy Markdown
Member Author

mikebrow commented Apr 8, 2021 •
edited
Loading

needs rebase to merge in 7648ad2

@mikebrow mikebrow force-pushed the toml-cri-defaults branch from 63abb3a to b8f2b55 Compare April 8, 2021 15:44
@mikebrow
Copy link
Copy Markdown
Member Author

mikebrow commented Apr 8, 2021

rebase done ready for review..

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 8, 2021

Build succeeded.

@mikebrow mikebrow force-pushed the toml-cri-defaults branch from b8f2b55 to dd16b00 Compare April 8, 2021 19:10
@mikebrow
Copy link
Copy Markdown
Member Author

mikebrow commented Apr 8, 2021

rebased to pick up CI fix ceb0875#diff-8563889eb6dad483119d8bc97418d0d7af505dca3a1f533629beac241b4529dfR35

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Apr 8, 2021

Build succeeded.

@mikebrow mikebrow requested a review from fuweid April 8, 2021 22:36
fuweid
fuweid approved these changes Apr 9, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

previewed in my local. it is pretty good!

@fuweid fuweid merged commit d064140 into containerd:master Apr 9, 2021
@fuweid fuweid mentioned this pull request Apr 9, 2021
Closed
@kevpar kevpar mentioned this pull request May 6, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dims dims dims approved these changes

@fuweid fuweid fuweid approved these changes

@AkihiroSuda AkihiroSuda Awaiting requested review from AkihiroSuda

@dmcgowan dmcgowan Awaiting requested review from dmcgowan

+1 more reviewer

@Zyqsempai Zyqsempai Zyqsempai approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

kind/docs kind/enhancement priority/P2

Projects

None yet

Milestone

1.5

Development

Successfully merging this pull request may close these issues.

4 participants

@mikebrow @dims @Zyqsempai @fuweid