Skip to content

Update cri to 4dd6735020f5596dd41738f8c4f5cb07fa804c5e.#2957

Merged
estesp merged 1 commit intocontainerd:masterfrom
Random-Liu:update-cri
Jan 25, 2019
Merged

Update cri to 4dd6735020f5596dd41738f8c4f5cb07fa804c5e.#2957
estesp merged 1 commit intocontainerd:masterfrom
Random-Liu:update-cri

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

@Random-Liu Random-Liu commented Jan 25, 2019 •
edited
Loading

Features:

  • Add config options DisableCgroup, DisableApparmor and RestrictOOMScoreAdj to support "rootless" mode.
  • Add generic runtime options for out-of-tree runtime support.

Bug fixes:

  • Fix an issue that pod or container without metadata causes containerd panic.
  • Fix an issue that containerd adds an extra newline when container output doesn't end with a newline.

The main purpose of this update is to fix the Kubernetes cluster e2e test:

Signed-off-by: Lantao Liu [email protected]

@Random-Liu
Update cri plugin to 4dd6735.
28f8a90 
Signed-off-by: Lantao Liu <[email protected]>
@Random-Liu Random-Liu added this to the 1.3 milestone Jan 25, 2019
@codecov-io
Copy link
Copy Markdown

codecov-io commented Jan 25, 2019 •
edited
Loading

Codecov Report

Merging #2957 into master will decrease coverage by 3.62%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2957      +/-   ##
==========================================
- Coverage   47.64%   44.02%   -3.63%     
==========================================
  Files          92      102      +10     
  Lines        8513    10863    +2350     
==========================================
+ Hits         4056     4782     +726     
- Misses       3730     5348    +1618     
- Partials      727      733       +6
Flag Coverage Δ
#linux 47.64% <ø> (ø) ⬆️
#windows 41.23% <ø> (?)
Impacted Files Coverage Δ
snapshots/native/native.go 43.04% <0%> (-9.99%) ⬇️
metadata/snapshot.go 45.8% <0%> (-8.96%) ⬇️
archive/tar.go 43.79% <0%> (-7.07%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 57.84% <0%> (-6.36%) ⬇️
content/local/store.go 48.51% <0%> (-5.03%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
metadata/images.go 58.46% <0%> (-4.7%) ⬇️
metadata/buckets.go 56.33% <0%> (-4.6%) ⬇️
... and 58 more

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 acdb225...28f8a90. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Jan 25, 2019

LGTM

estesp
estesp approved these changes Jan 25, 2019
View reviewed changes
Copy link
Copy Markdown
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

@estesp estesp merged commit 9aac018 into containerd:master Jan 25, 2019
@Random-Liu Random-Liu deleted the update-cri branch January 25, 2019 18:22
This was referenced Feb 3, 2019
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

1.3

Development

Successfully merging this pull request may close these issues.

4 participants

@Random-Liu @codecov-io @crosbymichael @estesp