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: v1.7.31
Choose a base ref
...
head repository: containerd/containerd
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.7.32
Choose a head ref
  • 18 commits
  • 12 files changed
  • 11 contributors

Commits on Jul 16, 2025

  1. Fix error parsing hosts.toml without any host tree

    Allows parsing a hosts.toml file that has no `[host]` or
    `[host."https://registry.example.com"]` entries.
    
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 16, 2025
    Configuration menu
    Copy the full SHA
    2400744 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2026

  1. Update release process after 1.7

    Signed-off-by: Derek McGowan <derek@mcg.dev>
    dmcgowan authored and k8s-infra-cherrypick-robot committed Apr 14, 2026
    Configuration menu
    Copy the full SHA
    1b30082 View commit details
    Browse the repository at this point in the history
  2. Update for latest updates to release tool

    Mention use of pull request labels
    
    Signed-off-by: Derek McGowan <derek@mcg.dev>
    dmcgowan authored and k8s-infra-cherrypick-robot committed Apr 14, 2026
    Configuration menu
    Copy the full SHA
    3223a75 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2026

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

    …-8250-to-release/1.7
    
    [release/1.7] Update release process after 1.7
    estesp authored Apr 20, 2026
    Configuration menu
    Copy the full SHA
    153e389 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2026

  1. Add GitHub Action for k8s node e2e tests

    Backport the k8s node e2e workflow from release/2.2. This file does not
    exist on release/1.7, so a direct copy is simpler than backporting the
    full history of commits modifying it.
    
    Wire up the workflow in .github/workflows/ci.yml with a matrix for
    Kubernetes 1.30, 1.31, 1.32, and 1.33.
    
    Adjustments made for release/1.7:
    - Remove arguments from script/setup/install-cni call to fall back to
      reading version from script/setup/cni-plugins-version, matching other
      integration tests on this branch.
    - Skip [Feature:RelaxedEnvironmentVariableValidation] tests because this
      feature is Alpha in Kubernetes 1.31 and disabled by default, causing
      failures when testing against K8s 1.31.
    - Skip private registry tests because they rely on hardcoded credentials
      that are no longer valid
      (see kubernetes/kubernetes#133261).
    
    Assisted-by: Antigravity
    Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
    chrishenzie committed Apr 22, 2026
    Configuration menu
    Copy the full SHA
    0db1e14 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    abff64a View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2026

  1. apparmor: Set abi conditionally

    The "abi" keyword was added for apparmor 3.0
    The original change to add this ended up breaking versions < 3.0.
    The abi itself is a macro in /etc/apparmor.d so we can check if the
    macro exists to determine if we *can* set an abi in the template.
    
    Signed-off-by: Brian Goff <cpuguy83@gmail.com>
    cpuguy83 authored and k8s-infra-cherrypick-robot committed Apr 23, 2026
    Configuration menu
    Copy the full SHA
    2b732c8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #13273 from k8s-infra-cherrypick-robot/cherry-pick…

    …-13268-to-release/1.7
    
    [release/1.7] apparmor: Set abi conditionally
    mxpv authored Apr 23, 2026
    Configuration menu
    Copy the full SHA
    e7da387 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2026

  1. Support both styles of volatile mount option

    Kernel 6.12.80+ returns 'fsync=volatile' instead of just 'volatile'
    in mount options, which breaks containerd's exact string matching
    checks.
    
    Fixes this issue by adding support for 'fsync=volatile' in addition
    to the existing 'volatile' check in RemoveVolatileOption and
    addVolatileOptionOnImageVolumeMount.
    
    Assisted-by: Antigravity
    Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
    (cherry picked from commit 93f7a62)
    Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
    chrishenzie committed Apr 24, 2026
    Configuration menu
    Copy the full SHA
    9407331 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2026

  1. Merge pull request #13299 from chrishenzie/release/1.7-volatile

    [release/1.7] Support both styles of volatile mount option
    mxpv authored Apr 28, 2026
    Configuration menu
    Copy the full SHA
    4393e22 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2026

  1. oci: return explicit error for out-of-range USER values

    Detect strconv.ErrRange and validate uid/gid bounds to avoid falling back to username/group lookups.
    
    Signed-off-by: LEI WANG <ssst0n3@gmail.com>
    (cherry picked from commit 85706b6)
    Signed-off-by: Chris Henzie <chrishenzie@gmail.com>
    ssst0n3 authored and chrishenzie committed May 11, 2026
    Configuration menu
    Copy the full SHA
    503f479 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #10028 from brandond/fix-hosts-toml

    [release/1.7] Fix issue with empty host tree in hosts.toml
    mxpv authored May 11, 2026
    Configuration menu
    Copy the full SHA
    33d9e24 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2026

  1. seccomp: Document socket rule scope and socketcall limitation

    Add a comment explaining the purpose of the socket rules and noting that
    on 32-bit x86, socket() goes through socketcall(2) which is allowed
    unconditionally, so these arg filters only apply to the direct socket
    syscall.
    
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    vvoland authored and k8s-infra-cherrypick-robot committed May 14, 2026
    Configuration menu
    Copy the full SHA
    4627a65 View commit details
    Browse the repository at this point in the history
  2. seccomp: Block AF_ALG in default socket policy

    AF_ALG (address family 38) exposes the Linux kernel crypto API to
    userspace via socket(2). Containers have no legitimate need for this
    interface under the default profile, and leaving it accessible widens
    the kernel attack surface unnecessarily (see https://copy.fail/).
    
    Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
    vvoland authored and k8s-infra-cherrypick-robot committed May 14, 2026
    Configuration menu
    Copy the full SHA
    e55b747 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2026

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

    …-13327-to-release/1.7
    fuweid authored May 15, 2026
    Configuration menu
    Copy the full SHA
    9c3d01b View commit details
    Browse the repository at this point in the history

Commits on May 20, 2026

  1. Merge pull request #13450 from samuelkarp/oci-withuser-errrange-1.7

    [release/1.7] oci: return explicit error for out-of-range USER values
    samuelkarp authored May 20, 2026
    Configuration menu
    Copy the full SHA
    6a05ddd View commit details
    Browse the repository at this point in the history
  2. Prepare release notes for v1.7.32

    Signed-off-by: Samuel Karp <samuelkarp@google.com>
    samuelkarp committed May 20, 2026
    Configuration menu
    Copy the full SHA
    bc87d86 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #13452 from samuelkarp/prepare-1.7.32

    [release/1.7] Prepare release notes for v1.7.32
    samuelkarp authored May 20, 2026
    Configuration menu
    Copy the full SHA
    180a7b7 View commit details
    Browse the repository at this point in the history
Loading