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.0.3
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.0.4
Choose a head ref
  • 19 commits
  • 21 files changed
  • 10 contributors

Commits on Mar 6, 2025

  1. build(deps): bump containerd/project-checks from 1.1.0 to 1.2.1

    Bumps [containerd/project-checks](https://github.com/containerd/project-checks) from 1.1.0 to 1.2.1.
    - [Commits](containerd/project-checks@434a071...800740a)
    
    ---
    updated-dependencies:
    - dependency-name: containerd/project-checks
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    (cherry picked from commit 69c0d7f)
    Signed-off-by: Akhil Mohan <[email protected]>
    dependabot[bot] authored and akhilerm committed Mar 6, 2025
    Configuration menu
    Copy the full SHA
    7215a7d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11497 from akhilerm/update-ltag-2.0

    [release/2.0] build(deps): bump containerd/project-checks from 1.1.0 to 1.2.1
    samuelkarp authored Mar 6, 2025
    Configuration menu
    Copy the full SHA
    a7f1ff9 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2025

  1. e2e: use the shim bundled with containerd artifact

    use the shim bundled with cri-cni-containerd tar rather than using
    the shim present on the host machine for running e2e
    
    Signed-off-by: Akhil Mohan <[email protected]>
    akhilerm authored and k8s-infra-cherrypick-robot committed Mar 7, 2025
    Configuration menu
    Copy the full SHA
    81b3384 View commit details
    Browse the repository at this point in the history
  2. docs: include note about unprivileged sysctls

    We changed the default setting for `enable_unprivileged_ports` and
    `enable_unprivileged_icmp` in the CRI plugin in
    #9348, but missed including
    this change in the release notes.
    
    Signed-off-by: Samuel Karp <[email protected]>
    samuelkarp authored and k8s-infra-cherrypick-robot committed Mar 7, 2025
    Configuration menu
    Copy the full SHA
    a39f114 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #11503 from k8s-infra-cherrypick-robot/cherry-pick…

    …-11489-to-release/2.0
    
    [release/2.0] e2e: use the shim bundled with containerd artifact
    estesp authored Mar 7, 2025
    Configuration menu
    Copy the full SHA
    62f18de View commit details
    Browse the repository at this point in the history
  4. Merge pull request #11506 from k8s-infra-cherrypick-robot/cherry-pick…

    …-11502-to-release/2.0
    
    [release/2.0] docs: include note about unprivileged sysctls
    estesp authored Mar 7, 2025
    Configuration menu
    Copy the full SHA
    ad6934d View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2025

  1. update build to go1.23.7, test go1.24.1

    - go1.23.7 (released 2025-03-04) includes security fixes to the net/http
    package, as well as bug fixes to cgo, the compiler, and the reflect,
    runtime, and syscall packages. See the Go 1.23.7 milestone on our issue
    tracker for details
    
    - go1.24.1 (released 2025-03-04) includes security fixes to the net/http
    package, as well as bug fixes to cgo, the compiler, the go command, and
    the reflect, runtime, and syscall packages. See the Go 1.24.1 milestone
    on our issue tracker for details.
    
    Signed-off-by: Akhil Mohan <[email protected]>
    akhilerm committed Mar 9, 2025
    Configuration menu
    Copy the full SHA
    e5ad0d0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11514 from akhilerm/2.0-update-go1.24.1

    [release/2.0] update build to go1.23.7, test go1.24.1
    AkihiroSuda authored Mar 9, 2025
    Configuration menu
    Copy the full SHA
    5a3ac90 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2025

  1. add name in package version

    Signed-off-by: ningmingxiao <[email protected]>
    ningmingxiao committed Mar 11, 2025
    Configuration menu
    Copy the full SHA
    4f03705 View commit details
    Browse the repository at this point in the history
  2. (cherry picked from commit de1341c)

    cji committed Mar 11, 2025
    Configuration menu
    Copy the full SHA
    07a0b54 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2025

  1. Merge pull request #11529 from ningmingxiao/v2.0_fix

    [release/2.0] Fix incorrect runtime name being passed to NRI
    dmcgowan authored Mar 13, 2025
    Configuration menu
    Copy the full SHA
    76db058 View commit details
    Browse the repository at this point in the history
  2. client: Respect client.WithTimeout option

    Fix the gRPC client dialer not using the timeout passed by the
    containerd client timeout option.
    
    Commit 63b4688 replaced the usage of deprecated `grpc.DialContext`
    with `grpc.NewClient`.
    
    However, the `dialer.ContextDialer` relied on the context deadline to
    propagate the timeout:
    
    https://github.com/containerd/containerd/blob/388fb336b0a458e2cf64212072743e622a3f44c7/vendor/google.golang.org/grpc/clientconn.go#L216
    
    This assumption is now broken, because `grpc.NewClient` doesn't do any
    initial connection and defers it to the first RPC usage.
    
    This commit passes the timeout via the `MinConnectTimeout` grpc
    connection param, which will be applied to **every** connection attempt
    (not just the first).
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland authored and k8s-infra-cherrypick-robot committed Mar 13, 2025
    Configuration menu
    Copy the full SHA
    6b5efba View commit details
    Browse the repository at this point in the history
  3. core/images: Ignore attestations when traversing children

    Before this patch, calling `image.Children` on an image built with
    BuildKit would produce unnecessary `encountered unknown type
    application/vnd.in-toto+json; children may not be fetched` debug logs,
    because the media type is neither a known layer or config type.
    
    Make the `image.Children` aware of the attestation layers and don't
    attempt to traverse them.
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland authored and k8s-infra-cherrypick-robot committed Mar 13, 2025
    Configuration menu
    Copy the full SHA
    df4d905 View commit details
    Browse the repository at this point in the history
  4. core/remotes: Handle attestations in MakeRefKey

    Don't produce `reference for unknown type: application/vnd.in-toto+json`
    warning logs when pushing/fetching an image containing the attestation
    manifests.
    
    Signed-off-by: Paweł Gronowski <[email protected]>
    vvoland authored and k8s-infra-cherrypick-robot committed Mar 13, 2025
    Configuration menu
    Copy the full SHA
    916d487 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2025

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

    …-11327-to-release/2.0
    
    [release/2.0] Update image type checks to avoid unnecessary logs for attestations
    AkihiroSuda authored Mar 14, 2025
    Configuration menu
    Copy the full SHA
    b6ab437 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11536 from k8s-infra-cherrypick-robot/cherry-pick…

    …-11508-to-release/2.0
    
    [release/2.0] Respect `client.WithTimeout` option on connect
    AkihiroSuda authored Mar 14, 2025
    Configuration menu
    Copy the full SHA
    e9989a2 View commit details
    Browse the repository at this point in the history
  3. Prepare release notes for v2.0.4

    Signed-off-by: Derek McGowan <[email protected]>
    dmcgowan committed Mar 14, 2025
    Configuration menu
    Copy the full SHA
    06a886a View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2025

  1. Merge pull request #11541 from dmcgowan/prepare-2.0.4

    [release/2.0] Prepare release notes for v2.0.4
    dmcgowan authored Mar 17, 2025
    Configuration menu
    Copy the full SHA
    bf82ae2 View commit details
    Browse the repository at this point in the history
  2. Merge commit from fork

    [release 2.0] validate uid/gid
    dmcgowan authored Mar 17, 2025
    Configuration menu
    Copy the full SHA
    1a43cb6 View commit details
    Browse the repository at this point in the history
Loading