Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containerd/containerd
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.0
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.1.1
Choose a head ref
  • 17 commits
  • 26 files changed
  • 11 contributors

Commits on May 7, 2025

  1. .github: mark 2.1 releases as latest

    Signed-off-by: Samuel Karp <[email protected]>
    samuelkarp committed May 7, 2025
    Configuration menu
    Copy the full SHA
    c90524d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11821 from samuelkarp/release-workflow-2.1

    [release/2.1] .github: mark 2.1 releases as latest
    estesp authored May 7, 2025
    Configuration menu
    Copy the full SHA
    b958237 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2025

  1. ctr:make sure containerd socket exist before create client

    Signed-off-by: ningmingxiao <[email protected]>
    ningmingxiao authored and k8s-infra-cherrypick-robot committed May 8, 2025
    Configuration menu
    Copy the full SHA
    e7be076 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11827 from k8s-infra-cherrypick-robot/cherry-pick…

    …-11811-to-release/2.1
    
    [release/2.1] ctr:make sure containerd socket exist before create client
    samuelkarp authored May 8, 2025
    Configuration menu
    Copy the full SHA
    3b1062a View commit details
    Browse the repository at this point in the history

Commits on May 10, 2025

  1. core/runtime/v2: cleanup shim-cleanup logs

    I noticed that the "cleaning up after shim disconnected" was logged as a
    warning, but I couldn't find a reason why it was considered a warning (
    and didn't see an error attached to the log);
    
        INFO[2025-05-07T08:57:56.576773500Z] ignoring event                                container=589c33c88591a9936cb8fd64453e4b0c1357ae2f79d975c34645ff8f0aa10485 module=libcontainerd namespace=moby topic=/tasks/delete type="*events.TaskDelete"
        INFO[2025-05-07T08:57:56.576938958Z] shim disconnected                             id=589c33c88591a9936cb8fd64453e4b0c1357ae2f79d975c34645ff8f0aa10485 namespace=moby
        WARN[2025-05-07T08:57:56.577356208Z] cleaning up after shim disconnected           id=589c33c88591a9936cb8fd64453e4b0c1357ae2f79d975c34645ff8f0aa10485 namespace=moby
        INFO[2025-05-07T08:57:56.577393417Z] cleaning up dead shim                         namespace=moby
    
    I think this must've been set as a warning by acccident, so changing
    this log to an "info" log as it seems part of the normal flow or operations.
    
    While updating, also updating related logs, such as the "cleaning up dead shim"
    log, to include the id, so that these logs can more easily be correlated.
    
    Signed-off-by: Sebastiaan van Stijn <[email protected]>
    thaJeztah authored and k8s-infra-cherrypick-robot committed May 10, 2025
    Configuration menu
    Copy the full SHA
    7fcbc3c View commit details
    Browse the repository at this point in the history
  2. Update removal version for deprecated registry config fields

    Config deprecations were postponed to 2.2:
    #11684
    
    Signed-off-by: Chris Henzie <[email protected]>
    chrishenzie authored and k8s-infra-cherrypick-robot committed May 10, 2025
    Configuration menu
    Copy the full SHA
    37d6c42 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #11835 from k8s-infra-cherrypick-robot/cherry-pick…

    …-11829-to-release/2.1
    
    [release/2.1] Update removal version for deprecated registry config fields
    AkihiroSuda authored May 10, 2025
    Configuration menu
    Copy the full SHA
    fdac3d2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #11831 from k8s-infra-cherrypick-robot/cherry-pick…

    …-11815-to-release/2.1
    
    [release/2.1] core/runtime/v2: cleanup shim-cleanup logs
    AkihiroSuda authored May 10, 2025
    Configuration menu
    Copy the full SHA
    dc795bf View commit details
    Browse the repository at this point in the history

Commits on May 12, 2025

  1. Revert "perf(applyNaive): avoid walking the tree for each file in the…

    … same directory"
    
    This reverts commit d8063c3.
    
    Signed-off-by: Samuel Karp <[email protected]>
    (cherry picked from commit 38c9bb9)
    Signed-off-by: Samuel Karp <[email protected]>
    samuelkarp committed May 12, 2025
    Configuration menu
    Copy the full SHA
    ac00b8e View commit details
    Browse the repository at this point in the history

Commits on May 13, 2025

  1. build(deps): bump github.com/Microsoft/hcsshim

    Bumps [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim) from 0.13.0-rc.3 to 0.13.0.
    - [Release notes](https://github.com/Microsoft/hcsshim/releases)
    - [Commits](microsoft/hcsshim@v0.13.0-rc.3...v0.13.0)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/Microsoft/hcsshim
      dependency-version: 0.13.0
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    (cherry picked from commit e29c0fe)
    Signed-off-by: Akhil Mohan <[email protected]>
    dependabot[bot] authored and akhilerm committed May 13, 2025
    Configuration menu
    Copy the full SHA
    0684f1c View commit details
    Browse the repository at this point in the history
  2. update runhcs version to v0.13.0

    Signed-off-by: Akhil Mohan <[email protected]>
    akhilerm committed May 13, 2025
    Configuration menu
    Copy the full SHA
    444ca17 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2025

  1. erofs-differ: fix EROFS native image support

    A dumb bug was just found after I worked out a usable native
    converter [1], instead of relying on some prebuilt image..
    
    [1] https://github.com/erofs/erofs-container-toolkit
    Signed-off-by: Gao Xiang <[email protected]>
    hsiangkao authored and k8s-infra-cherrypick-robot committed May 14, 2025
    Configuration menu
    Copy the full SHA
    2168cb9 View commit details
    Browse the repository at this point in the history
  2. docs/snapshotters/erofs.md: a tip for improved performance

    It's preferred to use `--sort=none` to avoid tar data twice due to
    stricter data ordering.
    
    Link: https://git.kernel.org/xiang/erofs-utils/c/e97530622872
    Signed-off-by: Gao Xiang <[email protected]>
    hsiangkao authored and k8s-infra-cherrypick-robot committed May 14, 2025
    Configuration menu
    Copy the full SHA
    e1817a4 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2025

  1. Merge pull request #11855 from k8s-infra-cherrypick-robot/cherry-pick…

    …-11851-to-release/2.1
    
    [release/2.1] erofs-snapshotter: a fix for native image support and a performance tip
    AkihiroSuda authored May 16, 2025
    Configuration menu
    Copy the full SHA
    837aef0 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2025

  1. Merge pull request #11847 from akhilerm/2.1-hcsshim-update

    [release/2.1] build(deps): bump github.com/Microsoft/hcsshim
    AkihiroSuda authored May 17, 2025
    Configuration menu
    Copy the full SHA
    c6f9835 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2025

  1. Prepare release notes for 2.1.1

    Signed-off-by: Derek McGowan <[email protected]>
    dmcgowan committed May 20, 2025
    Configuration menu
    Copy the full SHA
    216667b View commit details
    Browse the repository at this point in the history
  2. Merge commit from fork

    [release/2.1] Prepare release notes for 2.1.1
    dmcgowan authored May 20, 2025
    Configuration menu
    Copy the full SHA
    cb10766 View commit details
    Browse the repository at this point in the history
Loading