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

Update cri to b213648c5bd0a1d2ee42709c10dff63fbfee3ad7 #3492

Merged
merged 2 commits into from
Aug 6, 2019

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Aug 5, 2019

Containerd 1.3 is validated against v1.15, but it is also compatible with Kubernetes v1.12+. (See more details about support metrics)

Features

  • Supported per-pod containerd shim. The io.containerd.runc.v2 runtime is fully validated and ready to be used in production. This helps minimizing per-pod resource overhead. Note that io.containerd.runtime.v1.linux is still the default runtime. (Use per-pod shim. cri#1075)
  • Added file-based generic runtime config options. This will be used by out-of-tree runtimes like gvisor and kata (Add a generic runtime options api. cri#1029), e.g.
[plugins.cri.containerd.runtimes.kata]
  runtime_type = "io.containerd.kata.v1"
[plugins.cri.containerd.runtimes.kata.options]
  TypeUrl = "io.containerd.kata.v1.options"
  ConfigPath = "/etc/kata/config.toml"

Enhancements

Deprecation

Signed-off-by: Lantao Liu <lantaol@google.com>
Signed-off-by: Lantao Liu <lantaol@google.com>
@jterry75
Copy link
Contributor

jterry75 commented Aug 5, 2019

Love it!

@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 5, 2019

Build succeeded.

@codecov-io
Copy link

Codecov Report

Merging #3492 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3492   +/-   ##
=======================================
  Coverage   44.25%   44.25%           
=======================================
  Files         124      124           
  Lines       13829    13829           
=======================================
  Hits         6120     6120           
  Misses       6767     6767           
  Partials      942      942
Flag Coverage Δ
#linux 48.05% <ø> (ø) ⬆️
#windows 39.79% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 29e56c5...a5940da. Read the comment docs.

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Member

LGTM

@crosbymichael crosbymichael merged commit 28bdb71 into containerd:master Aug 6, 2019
@crosbymichael
Copy link
Member

Nice changeset @Random-Liu !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants