Skip to content

[release/1.2] Prepare v1.2.12 release#3984

Merged
dmcgowan merged 2 commits intocontainerd:release/1.2from
thaJeztah:release_1.2.12
Feb 4, 2020
Merged

[release/1.2] Prepare v1.2.12 release#3984
dmcgowan merged 2 commits intocontainerd:release/1.2from
thaJeztah:release_1.2.12

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

  • Update the runc vendor to v1.0.0-rc10 which includes a mitigation for CVE-2019-19921.

  • Update the opencontainers/selinux which includes a mitigation for CVE-2019-16884.

  • Update Golang runtime to 1.12.15, which includes a fix to the runtime (Go 1.12.14, Go 1.12.15) and and the net/http package (Go 1.12.15)

  • A fix to prevent SIGSEGV when starting containerd-shim containerd/containerd#3960

  • Fixes to exec containerd/containerd#3755

    • Prevent docker exec hanging if an earlier docker exec left a zombie process
    • Prevent High system load/CPU utilization with liveness and readiness probes
    • Prevent Docker healthcheck causing high CPU utilization
  • CRI fixes:

    • Update the gopkg.in/yaml.v2 vendor to v2.2.8 with a mitigation for CVE-2019-11253

Comment thread releases/v1.2.12.toml Outdated
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Not sure if this one should be mentioned; IIUC the CVE was in the runc binary, and the updated dependency has no effect in this code-base (please double check); if so, I'm inclined to remove the mention here and above

Comment thread releases/v1.2.12.toml Outdated
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is pending containerd/cri#1388 to be merged, and containerd/cri to be re-vendored

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 28, 2020

Generated release notes:

containerd 1.2.12

Welcome to the v1.2.12 release of containerd!

The twelfth patch release for containerd 1.2 includes an updated runc with
a fix for CVE-2019-19921, an updated version of the opencontainers/selinux
dependency, which includes a fix for CVE-2019-16884, an updated version of the
gopkg.in/yaml.v2 dependency to address CVE-2019-11253, and a Golang update.

Notable Updates

  • Update the runc vendor to v1.0.0-rc10 which includes a mitigation for CVE-2019-19921.

  • Update the opencontainers/selinux which includes a mitigation for CVE-2019-16884.

  • Update Golang runtime to 1.12.16, mitigating the CVE-2020-0601 certificate verification bypass on Windows, and CVE-2020-7919, which only affects 32-bit architectures.

  • Update Golang runtime to 1.12.15, which includes a fix to the runtime (Go 1.12.14, Go 1.12.15) and and the net/http package (Go 1.12.15)

  • A fix to prevent SIGSEGV when starting containerd-shim containerd/containerd#3960

  • Fixes to exec containerd/containerd#3755

    • Prevent docker exec hanging if an earlier docker exec left a zombie process
    • Prevent High system load/CPU utilization with liveness and readiness probes
    • Prevent Docker healthcheck causing high CPU utilization
  • CRI fixes:

    • Update the gopkg.in/yaml.v2 vendor to v2.2.8 with a mitigation for CVE-2019-11253

API

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

Contributors

  • Sebastiaan van Stijn
  • Lantao Liu
  • Phil Estes
  • Davanum Srinivas
  • Derek McGowan
  • Michael Crosby
  • Mike Brown
  • Maksym Pavlenko
  • Akihiro Suda
  • Wei Fu
  • unknown

Changes

  • 35c414af Prepare v1.2.12 release
  • 7018df22 Merge pull request #3996 from thaJeztah/1.2_bump_containerd_cri
  • 9c7bd507 Merge pull request #3997 from thaJeztah/1.2_backport_dockerfile_test_fixes
  • 89c589bf Merge pull request #3995 from thaJeztah/1.2_backport_bump_grpc
  • 8761b1bf Update name for btrfs headers package
  • 5db3987e Fix dependency in BUILDING.md
  • 94561168 [release/1.2] vendor: bump containerd/cri b1052f3b73fb9f0a6805d3c20e884a4cef265a38
  • 520c8cb8 bump google.golang.org/grpc v1.23.1
  • a558638e Merge pull request #3993 from thaJeztah/1.2_update_containerd_cri
  • c12aaf0e vendor: bump gopkg.in/yaml.v2 v2.2.8
  • 9d1954f2 vendor: bump containerd/cri b075cc4e9f394780dbed101601c48dcc3d37c828 (release/1.2 branch)
  • 92b40b62 Merge pull request #3988 from thaJeztah/1.2_bump_golang_1.12.16
  • 1bc2590d vendor: update golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
  • 44b5bac0 Update Golang 1.12.16 (CVE-2020-0601, CVE-2020-7919)
  • 72769740 Merge pull request #3982 from dims/bump-opencontainers/selinux-for-CVE-2019-16884-release-1.2
  • 4c03d5df Pick up fix for CVE-2019-16884 in opencontainers/selinux
  • 318111bd Merge pull request #3977 from dims/update-to-new-rc10-of-opencontainers/runc-release-1.2
  • 87648d2a Bump to opencontainers/runc new version - v1.0.0-rc10
  • 701a8d0d Merge pull request #3968 from thaJeztah/1.2_bump_golang_1.12.15
  • f106ae4a Update Golang 1.12.15
  • 625b11b6 Merge pull request #3960 from fuweid/cp-3559
  • 4288ba10 runtime: only check killall for init process
  • 28d16271 Merge pull request #3918 from thaJeztah/1.2_bump_golang_1.12.14
  • e7b06baa Update Golang 1.12.14
  • b584375b Merge pull request #3909 from estesp/cp-3898-1.2
  • 34978bf3 Disable criu tests in Travis CI
  • 79f4c650 Merge pull request #3755 from thaJeztah/1.2_backport_avoid_unnecessary_runc_state
  • ec48c950 Merge pull request #3856 from fuweid/cp-1.2-3853
  • de8ed89b Fix cleanup error on content client test
  • 0877136a Use cached state instead of runc state.
  • f71f6d39 Robust pid locking for shim processes
  • 42aba6e0 Add timeout for I/O waitgroups

Changes from containerd/cri

  • b1052f3b Merge pull request #1392 from dims/sync-vendors-with-containerd-in-release/1.2
  • 6adfc229 Merge pull request #1389 from dims/update-opencontainers/selinux-in-release/1.2
  • 6f8dc60e Sync vendors with containerd 1.2.11
  • ae6b4816 pick up fix for CVE-2019-19921 in opencontainers/selinux
  • b075cc4e Merge pull request #1388 from thaJeztah/1.2_bump_yaml
  • b1a3e1e9 [release/1.2] vendor: bump gopkg.in/yaml.v2 v2.2.8
  • 5420c6fb Merge pull request #1354 from Random-Liu/cherrypick-#1351-release-1.2
  • 12b09431 Better handle unknown state.
  • 57022a55 Merge pull request #1321 from Random-Liu/cherrypick-#1319-release-1.2
  • c229ad5c Fix containerd build, use libbtrfs-dev when available.
  • 80959d35 Merge pull request #1313 from Random-Liu/cherrypick-#1312-release-1.2
  • 6a7a8275 Update based on default xenial distro.
  • 69a876d4 Merge pull request #1305 from Random-Liu/sync-vendor-release-1.2
  • b638ad99 Sync vendors with containerd.

Dependency Changes

Previous release can be found at v1.2.11

  • github.com/containerd/cri bab7348fcfcc -> b1052f3b73fb
  • github.com/opencontainers/runc d736ef14f028 -> dc9208a3303f
  • github.com/opencontainers/selinux v1.2.2 -> 5215b1806f52
  • golang.org/x/crypto 49796115aa4b -> 69ecbb4d6d5d
  • google.golang.org/appengine 54a98f90d1c4 new
  • google.golang.org/grpc 6eaf6f47437a -> 39e8a7b072a6
  • gopkg.in/yaml.v2 v2.2.1 -> 53403b58ad1b

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 28, 2020

Also need to include #3988 and #3993

And (from slack chat with @dmcgowan);

### API
* Fix API filters to properly handle and return parse errors [containerd/containerd#3950](https://github.com/containerd/containerd/pull/3950)

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 30, 2020

Also probably good to vendor before release;

@estesp
Copy link
Copy Markdown
Member

estesp commented Jan 31, 2020

@thaJeztah those both appear to be complete and I just compared cri 1.2 branch with our release/1.2 branch and it seems correct; anything else we are waiting on?

@thaJeztah
Copy link
Copy Markdown
Member Author

nope; I think we should be done. I'll update this PR to add the missing changes to the changelog

@thaJeztah thaJeztah marked this pull request as ready for review January 31, 2020 16:22
@thaJeztah
Copy link
Copy Markdown
Member Author

Updated, and moved out of draft 👍

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jan 31, 2020

Codecov Report

Merging #3984 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3984   +/-   ##
============================================
  Coverage        44.19%   44.19%           
============================================
  Files              100      100           
  Lines            10847    10847           
============================================
  Hits              4794     4794           
  Misses            5313     5313           
  Partials           740      740
Flag Coverage Δ
#linux 47.87% <ø> (ø) ⬆️
#windows 41% <ø> (ø) ⬆️

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 7018df2...79d6576. Read the comment docs.

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

@thaJeztah
Copy link
Copy Markdown
Member Author

rebased, as some changes went into the branch

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

@thaJeztah
Copy link
Copy Markdown
Member Author

@dmcgowan we didn't merge yet; merge whenever you're ready

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Feb 3, 2020

This is ready to go, I'll merge it in a bit when ready to do the release. I want to make sure the 1.3.x is also ready to go. I'll open up that PR shortly

dmcgowan and others added 2 commits February 3, 2020 23:24
Signed-off-by: Derek McGowan <[email protected]>
* Update the runc vendor to v1.0.0-rc10 which includes a mitigation for [CVE-2019-19921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19921).
* Update the opencontainers/selinux which includes a mitigation for [CVE-2019-16884](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-16884).
* Update Golang runtime to 1.12.16, mitigating the [CVE-2020-0601](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-0601) certificate verification bypass on Windows, and [CVE-2020-7919](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7919), which only affects 32-bit architectures.
* Update Golang runtime to 1.12.15, which includes a fix to the runtime (Go 1.12.14, Go 1.12.15) and and the `net/http` package (Go 1.12.15)
* A fix to prevent `SIGSEGV` when starting containerd-shim [containerd#3960](containerd#3960)
* Fixes to `exec` [containerd#3755](containerd#3755)
    - Prevent `docker exec` hanging if an earlier `docker exec` left a zombie process
    - Prevent High system load/CPU utilization with liveness and readiness probes
    - Prevent Docker healthcheck causing high CPU utilization

* CRI fixes:
    - Update the `gopkg.in/yaml.v2` vendor to v2.2.8 with a mitigation for [CVE-2019-11253](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11253)

* API
    - Fix API filters to properly handle and return parse errors [containerd#3950](containerd#3950)

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@dmcgowan dmcgowan merged commit 35bd7a5 into containerd:release/1.2 Feb 4, 2020
@thaJeztah thaJeztah deleted the release_1.2.12 branch February 4, 2020 08:17
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.

5 participants