containerd: update to v2.2.2master-next

Bumping containerd to version v2.2.2-11-g5957d3334, which comprises the following commits:

    a83510103 cri: UpdatePodSandbox should return Unimplemented
    ee4179e52 fix(oci): apply absolute symlink resolution to /etc/group
    fd061b848 test(oci): use fstest and mock fs for better symlink coverage
    5d44d2c22 fix(oci): handle absolute symlinks in rootfs user lookup
    00c776f07 update to go1.25.8, test go1.26.1
    7e6ecf434 Prepare release notes for v2.2.2
    a20dead7c set default config_path in plugin init
    fbed68b8f Fix TOCTOU race bug in tar extraction
    68855cb0b ci: modprobe xt_comment on almalinux
    ef7a8beb3 core/mount: add test for getUnprivilegedMountFlags
    07b2cc07e core/mount: fix getUnprivilegedMountFlags iterating over indices instead of values
    a5f83d8c2 cri: unpack images with per-layer labels for runtime-specific snapshotters
    54101116f add integration test for cni result nil
    d44c4384e address comment
    f1835270b fix issue where cni del is never executed
    5dbf1b915 update golangci-lint to v2.9.0 with go1.26 support
    8ec695ebe remove windows/arm from cross build
    b9c22a6e3 ci: build/test go1.26.0
    6c05047b4 apparmor: explicitly set abi/3.0
    09b876a81 integration: Fix TestImageLoad() failure on CI
    172ba65b6 cri: Fix image volumes with user namespaces
    b4240ef87 update to go1.24.13, go1.25.7
    94dbfaea7 ci: bump go 1.24.12, 1.25.6
    e46a7a286 set fetch-depth for containerd to 0 for version parsing
    1d7908273 core/mount/manager: fix bind mount missing rbind option
    3d509bcd3 core/mount/manager: add tests for WithTemporary option
    cb3ae2119 fix: sanitize error before gRPC return to prevent credential leak in pod events
    533a2552e build(deps): bump google.golang.org/grpc from 1.77.0 to 1.78.0
    b120237fb build(deps): bump google.golang.org/grpc from 1.76.0 to 1.77.0
    a76eb698a cri: emit warning for concurrent CreateContainer
    4be4e5156 Fix nil pointer dereference in container spec memory metrics
    3d2e188b1 cri: Use the runtimeHandler parameter in PullImage
    633057382 cri: move noisy CDI logs to debug level
    8a7409e2e Reinstate image decryption
    f6bae1f88 Prepare release notes for v2.2.1
    c22cf5d49 cri,nri: pass any linux security profile to plugins.
    d7532de75 cri,nri: pass any linux RDT constraints to plugins.
    ef36e6181 cri,nri: pass any linux net devices to plugins.
    d56faf426 cri,nri: pass any linux scheduler attributes to plugins.
    e1824d261 cri,nri: pass any linux I/O priority to plugins.
    01d5490ae go.{mod,sum}: bump NRI deps to v0.11.0, re-vendor.
    58d23ab63 pkg/tracing: HTTPStatusCodeAttributes: remove use of deprecated SemConv const
    05ccbb3a7 cri/nri: short-circuit nil adjustment.
    c166a577d go.{mod,sum} bump CDI deps to v1.1.0.
    8a5fc8641 go.mod: github.com/containernetworking/plugins v1.9.0
    73a08aa00 go.mod: remove exclude rules
    cee08c8af build(deps): bump github.com/containerd/zfs/v2 from 2.0.0-rc.0 to 2.0.0
    55c93d6fb go.mod: golang.org/x/crypto v0.45.0
    aedd29bb4 ci: bump Go 1.24.11, 1.25.5
    26628f139 ci: bump Go 1.24.10, 1.25.4
    8bb0e9be6 ci(release): set GO_VERSION in Dockerfile
    ed19c5420 core/runtime/v2: remove uses of otelgrpc.UnaryClientInterceptor
    952237d9b ci: update CIFuzz actions to support Ubuntu 24.04
    51582ed27 bump containerd/cgroups to v3.1.2
    50d0e4fd4 build(deps): bump github.com/containerd/cgroups/v3 from 3.1.0 to 3.1.1
    fb5b818a9 runc: Update runc binary to v1.3.4
    e3bf2b80b build(deps): bump github.com/opencontainers/selinux
    41a69eb0d core/mount: should not call removeLoop when set autoclear
    da8e846f9 .github: skip 5 critest cases in window CI pipeline
    c707f771a fix: redact all query parameters in CRI error logs
    d154e234b Update the ctr pull defaults when using the transfer service
    09364216d Fix transfer unpack defaults on darwin
    2055d3c62 Update default differs on darwin
    9da97686d Use default writable size in erofs snapshotter for non-Linux hosts
    eeb0f889a Update default erofs block size on macOS during erofs diff
    678f944dd Revert "Implement io.ReaderAt on docker fetch reader"
    8b73c2de3 remotes: fix possible panic from WithMediaTypeKeyPrefix
    8eaa0b5cb Prepare release notes for v2.2.0
    8885b1b7a Make v2.2.0 the latest release
    d77d3bc34 Update releases file
    491f77350 Update api version to v1.10.0
    1ea370e9e Update platforms version to latest
    77644a1b0 Update EROFS snapshotter documentation
    8c98030c4 runc: Update runc binary to v1.3.3
    715d6f8e4 Update Darwin defaults to useable values
    69c855bb5 Prepare release notes for api/v1.10.0
    f72025d05 Update GHA runners to use latest images for basic binaries build
    acbaa8a99 ci: bump Go 1.24.9, 1.25.3
    910171e90 Fix directory permissions
    a0d0f0ef6 fix goroutine leak of container Attach
    0928a980c build(deps): bump lycheeverse/lychee-action from 2.6.1 to 2.7.0
    31132cc91 build(deps): bump github/codeql-action from 4.31.0 to 4.31.2
    9ae5468e0 build(deps): bump github.com/intel/goresctrl from 0.9.0 to 0.10.0
    565151652 Add size check to referrers response
    bda01054f fix: ci TestContainerListStatsWithIdSandboxIdFilter failed because multiple id found
    7bf5b92e6 Add Readonly setup to EROFS mount loop handler
    ebb52e3fb add missing container process metrics.
    18be704f7 add container_threads to metric descriptors
    7429a7b75 add container_start_time_seconds
    6eef0737b add container_ulimits_soft
    4b5f23e8a add oom metrics
    a68690c8c add container spec metrics
    e65874cfb add miscellaneous metrics
    ba524db34 snapshot: check parent's kind before commit
    e817edf89 CI: update Fedora to 43
    2e0e47c47 Deprecate cgroup v1
    189de942c Prepare release notes for v2.2.0-rc.0
    db3c5b7b7 Update api version to v1.10.0-rc.0
    d9d3c8223 Cleanup load shim info
    42336c7de Update referrers interface to support more options
    9840ad93e docker: fix addQuery with multiple calls
    2d40b7fba build(deps): bump golang.org/x/time in the golang-x group
    8ef2cfb7e Improve documentation for mount manager
    4c7b94fce api/go.mod: golang.org/x/net v0.38.0
    f508730d5 cgroups: bump to v3.1.0
    842cb99a5 containerd-shim-runc-v2: monitor OOM event after creation
    867728517 build(deps): bump github/codeql-action from 4.30.9 to 4.31.0
    a741a44cf build(deps): bump actions/download-artifact from 5.0.0 to 6.0.0
    94c2d3853 build(deps): bump actions/upload-artifact from 4.6.2 to 5.0.0
    c59cc44c0 CI: skip ubuntu-24.04-arm on private repos
    04d8ae1d6 Postpone v2.2 deprecation items to v2.3
    d939b6af5 Remove rebase validation logic from overlay snapshotter
    fbc7848f2 Prepare release notes for api/v1.10.0-rc.0
    7b7c5c171 Add rebase capability to erofs
    0198b87fc Implement parallel unpack
    c9afcc2bc cri: retry stop container if there is connection closed
    2042e805b cri/server/podsandbox: disable event subscriber
    5b9d871fe Add EROFS mount handler plugin
    a418e280a add process metrics
    7da6a9c21 add disk and diskIO metrics
    2e58d4ccf add network metrics
    68beb8191 add memory metrics
    63eca8fe9 implement CRI ListMetricDescriptors
    1bd3b45ad add cpu metrics
    942d7afc6 Implement CRI ListPodSandboxMetrics
    24e8734a5 .github: dump kernel message in Vagrant box
    8a6e6263f Support arbitary mkfs size (not only in MiB)
    3cc411c8b Fix backreference support for mount manager
    4f130dbe7 cri: retry stopSandboxContainer if shim connection is closed
    679a6d0a7 build(deps): bump github.com/klauspost/compress from 1.18.0 to 1.18.1
    0da68e8b4 build(deps): bump github/codeql-action from 4.30.8 to 4.30.9
    62845f4a9 Simplify oom event handling for cgroups v2 in shim
    0d62c7188 Update loopback test to make initialization more robust
    9ae0168c7 Add focus test option to critest
    a7d26b35e client: add referrers support to client
    9e9620dd6 chore: fix some function names in comment
    5386802f8 Default config_path if legacy registry options are not set.
    25c3871ba Switch mount manager tests to ext4
    55d5d5b50 Add Close method to mount manager
    2a8d30117 Set default run platform in ctr
    92bc4fadc Update task manager to use mount transformers
    2f75989e2 Update erofs to use mount transformers
    be9f183f4 Add mount transformers to mount manager
    1adaf27c1 Update erofs to compile on Darwin
    ee8ae9d56 Update erofs snapshotter to use mount manager
    fe02fcc5f docs: update default values for unprivileged port and ICMP settings
    ed2e81a78 bugfix:sync parent dir to ensure blob entry is reliably stored
    932b65a49 restart:use goroutine to speedup loadShims
    5243cdd2d Check expected digest when committing as a sanity check
    f2b9ff67f Make dockerPusher more compliant with distribution spec

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index 4a6d26c3..d69518d4 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -5,8 +5,8 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
                support as well as checkpoint and restore for cloning and live migration of containers."
 
 
-SRCREV = "a7e49900aa74c23f294fe050f88f2bbfcdaadd2a"
-SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
+SRCREV = "5957d3334bcaeddc2bd8e665f53cee318c298a2c"
+SRC_URI = "git://github.com/containerd/containerd;branch=release/2.2;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
            file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
            file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \
            file://cni-containerd-net.conflist \
@@ -16,7 +16,7 @@ SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;des
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v2.2.0-beta.1"
+CONTAINERD_VERSION = "2.2.2"
 
 # EXTRA_OEMAKE += "GODEBUG=1"