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.

Sign up for GitHub

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

Jump to bottom

[23.0 backport] vendor: github.com/containerd/containerd v1.6.21 #45477

Merged
merged 7 commits into from May 5, 2023
Merged

[23.0 backport] vendor: github.com/containerd/containerd v1.6.21 #45477

merged 7 commits into from May 5, 2023

Commits on May 5, 2023

  1. Update github.com/containerd/containerd to the HEAD of `release/1.6… 

    …` and vendor

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
(cherry picked from commit e85c69e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @laurazard @thaJeztah
    laurazard authored and thaJeztah committed May 5, 2023
    Configuration menu
    Copy the full SHA
    e0843f2 View commit details
    Browse the repository at this point in the history

  2. vendor: github.com/containerd/ttrpc v1.1.1 

    - server: Fix connection leak when receiving ECONNRESET

full diff: containerd/ttrpc@v1.1.0...v1.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c733cf2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 5, 2023
    Configuration menu
    Copy the full SHA
    382e9eb View commit details
    Browse the repository at this point in the history

  3. vendor: opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492… 

    …d3f1b

full diff: opencontainers/image-spec@02efb9a...3a7f492

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0233029)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 5, 2023
    Configuration menu
    Copy the full SHA
    cf7742e View commit details
    Browse the repository at this point in the history

  4. vendor: re-vendor to add missing file 

    When running hack/vendor.sh, I noticed this file was added to vendor.
I suspect this should've been part of 0233029,
but the vendor check doesn't appear to be catching this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3f09316)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 5, 2023
    Configuration menu
    Copy the full SHA
    d06cf03 View commit details
    Browse the repository at this point in the history

  5. vendor: github.com/containerd/containerd v1.6.20 

    full diff: containerd/containerd@de33abf...v1.6.20

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 61a0e79)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 5, 2023
    Configuration menu
    Copy the full SHA
    bd4620f View commit details
    Browse the repository at this point in the history

  6. Vendor containerd 1.6.x with the readonly mount fix 

    Uses containerd from release/1.6 commit containerd/containerd@c0efc63

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
(cherry picked from commit be4abf9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @rumpl @thaJeztah
    rumpl authored and thaJeztah committed May 5, 2023
    Configuration menu
    Copy the full SHA
    e00f6ef View commit details
    Browse the repository at this point in the history

  7. vendor: github.com/containerd/containerd v1.6.21 

    release notes: https://github.com/containerd/containerd/releases/tag/v1.6.21

Notable Updates

- update runc binary to v1.1.7
- Remove entry for container from container store on error
- oci: partially restore comment on read-only mounts for uid/gid uses
- windows: Add ArgsEscaped support for CRI
- oci: Use WithReadonlyTempMount when adding users/groups
- archive: consistently respect value of WithSkipDockerManifest

full diff: containerd/containerd@c0efc63...v1.6.21

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a873134)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 5, 2023
    Configuration menu
    Copy the full SHA
    14661fc View commit details
    Browse the repository at this point in the history