containerd: update to v2.2.0-beta.1

Bumping containerd to version v2.2.0-beta.1-12-ga7e49900a, which comprises the following commits:

    a4ddfd7eb build(deps): bump the golang-x group with 2 updates
    c740c57b4 build(deps): bump github/codeql-action from 3.30.6 to 4.30.8
    6316ab81d build(deps): bump softprops/action-gh-release from 2.3.4 to 2.4.1
    ed2e81a78 bugfix:sync parent dir to ensure blob entry is reliably stored
    bfd6c52b4 Defer removal of deprecated registry config fields to 2.3
    71f5d16aa bugfix:fix container logs lost because io close too quickly
    c039f5349 ci: bump Go 1.24.8
    773bfa0ea Use tartest to simplify generating a tar
    6a3b10fe7 Add a test for the erofs differ using tar index mode
    42f2784ca Update go.mod to use api/v1.10.0-beta.1
    8922d84e5 build(deps): bump google.golang.org/grpc from 1.75.1 to 1.76.0
    36c22f45c Update referrers fallback logic to always have a fallback
    0f3c5484f Fix gha api release file path
    f6b3b8cbe build(deps): bump ossf/scorecard-action from 2.4.2 to 2.4.3
    7a7d7a996 build(deps): bump github/codeql-action from 3.30.5 to 3.30.6
    669c3047a build(deps): bump softprops/action-gh-release from 2.3.3 to 2.3.4
    ba606fe14 build(deps): bump actions/stale from 10.0.0 to 10.1.0
    15d5fa725 build(deps): bump google.golang.org/protobuf from 1.36.9 to 1.36.10
    60fb4adb0 1.6 is EOL
    aa571f63c Prepare release notes for api/v1.10.0-beta.0
    83a946dca Add missing implicit dependency to podsandbox controller
    c69f443ba Update sandbox controllers service implicit dependency
    637429a25 Update logging for sandbox controller service
    f0aeb9037 Add sandbox controller create call to client
    a338d8b2f Fix sandbox client shutdown to ignore not found errors
    54ba402a2 Add default sandboxer to client
    c7b3114eb Update mount manager code documentation
    f3af360f6 Update runtime to read allowed custom mounts from runtime
    2189d3d6c build(deps): bump docker/login-action from 3.5.0 to 3.6.0
    cfb1b653d build(deps): bump actions/cache from 4.2.4 to 4.3.0
    94e6bcea5 Add support for allowing custom types through mount manager
    efc995011 Add runtimes option to task manager
    dd9c43150 Add option to allow formatted mounts
    9c21e867e Handle flaky case for loop autoclear
    f7b77e649 Update mount manager cleanup logic
    069cbfe8f Use mount manager for temp mounts
    93070961b Update snapshotter tests to use mount manager
    fa327566b Fix mount manager deactivate errors
    9c0cc4a42 Add mount manager format test
    61b8426ae Add mount manager documentation
    67f0970a5 Add mount activation integration test
    39f128b99 fix invalid deactivate error
    76a877bb5 Add mount activation support to task service
    5b4de2c34 Add implementation of list and get mount activation
    184fae60f Add backreference support to mount manager
    9794addce Add mount formatting test
    d8e5cdd76 Fix gc cleanup and add unit tests for gc
    49634889f Update ctr image mounts to use mount manager
    62062902f Add support for mount manager to ctr snapshots mount
    563b28154 Add mount manager to client
    c8e7674cc Add temporary mount support to manager
    aba772012 Add debug logs to mount service calls
    d23e635a5 Fix mount manager plugin when no handlers provided
    75ed5e003 Fix mount manager gc
    8db301086 Add mounts api service
    67fbf9db9 Generate and vendor proto changes
    c5097ac63 Add mount manager to protobuf services and types
    4d34b01ce Add loopback and overlay mount manager tests
    0e88cde87 build(deps): bump github/codeql-action from 3.30.3 to 3.30.5
    5a00693e7 Fix integ-test: looking for sleep inf as longCommand
    739821fc5 pkg/display: use platforms.Format for platform display
    748cd9f03 Prevent goroutine hangs during ProgressTracker shutdown
    54325eedc Fix typos introduced on PR 12323
    a7537cb8a Add referrers to default registries
    b668614b5 Add referrers to host config
    c1b1297c6 Update capabilities for referrers
    09b4ac136 Add referrers fetcher to remotes
    9ca659a53 Add conf.d include in the default config
    de20021f5 Make E2E workflow a required check
    cbfb535ad Add a comment to explain why apt-get install erofs-utils can't be used
    3df2b5d98 TestErofs/Rename fails with EROFS snapshotter
    c1bf79e7a Build and install erofs-utils from source and modprobe erofs
    35f94ef70 vendor: opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2
    33e6b79fc Fix device mapper suspend/resume flakyness
    5be6c0309 build(deps): bump azure/CLI from 2.1.0 to 2.2.0
    7e74801b7 Move wintls as internal pkg
    d2adfd820 Add support to retrieve certificate and key from windows cert store
    6243cf562 Add mount manager tests
    f4b7b9344 Improve formatting and support for deactivate
    55ff11737 Add loopback mount handler
    ed03f3a71 Add mount manager plugin and types
    78ca11c1c Add mount garbage collection resource
    c71598622 Add mount manager interface to mount package
    1809f3ef1 Update metadata gc to run context finishes in parallel
    37cec6800 Move transaction context to boltutil
    09644bd13 [github-action] release - Empty allowedSignersFile
    635907e63 Ensure errContentRangeIgnored error when range-get request is ignored by registry
    010ad4c06 build(deps): bump google.golang.org/protobuf from 1.36.8 to 1.36.9
    8112ca64f cri: remove copying of message structs
    9d351805b go.mod: Bump up k8s.io to 0.34.1
    517ca7566 build(deps): bump google.golang.org/grpc from 1.75.0 to 1.75.1
    e009b98ce build(deps): bump github/codeql-action from 3.30.1 to 3.30.3
    84aa20676 docs: Update 1.7 LTS support timeline
    cfe20b588 add k8s 1.34 support matrix
    479cf42ca Add extraction progress to transfer service
    09e531b88 Add progress to apply options
    a85610d52 Prepare release notes for v2.2.0-beta.0
    dba7f8fbe Update releases doc to show v2.2 has started beta
    da2a8b34e build(deps): bump softprops/action-gh-release from 2.3.2 to 2.3.3
    6f92111a9 build(deps): bump actions/stale from 9.1.0 to 10.0.0
    52c310c98 build(deps): bump actions/github-script from 7.0.1 to 8.0.0
    39a38dd60 build(deps): bump google-github-actions/upload-cloud-storage
    284716350 build(deps): bump github/codeql-action from 3.30.0 to 3.30.1
    d4fd22ce7 build(deps): bump github.com/prometheus/client_golang
    b2866150a build(deps): bump the golang-x group with 3 updates
    65badbef4 Resolve `staticcheck` complaints on FreeBSD
    f45716efe Clean up issues cited by `usetesting` package with golangci
    53d78b68d runc:Update runc binary to v1.3.1
    c77b70852 pkg/cio: Close(): use errors.Join to return all errors
    bfbb18ca8 build(deps): bump github.com/containernetworking/plugins
    1fac82f0e build(deps): bump github.com/checkpoint-restore/checkpointctl
    6374ac511 build(deps): bump actions/attest-build-provenance from 2.4.0 to 3.0.0
    23c51c25b build(deps): bump github/codeql-action from 3.29.11 to 3.30.0
    b56804da7 build(deps): bump google-github-actions/auth from 2.1.12 to 3.0.0
    683cd7d60 gc:make sure lastCollection is not nil
    bcecb979a build(deps): bump lycheeverse/lychee-action from 2.5.0 to 2.6.1
    fb28794f4 Update Go requirements in BUILDING
    591a769a6 build(deps): bump google.golang.org/protobuf from 1.36.7 to 1.36.8
    f4238238f build(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.0
    fd1a7a102 build(deps): bump google.golang.org/grpc from 1.74.2 to 1.75.0
    8ebe57e2e build(deps): bump github.com/coreos/go-systemd/v22 from 22.5.0 to 22.6.0
    cc2a52ca8 Update pkg/oci to use FS interface
    6fa776811 docs: remove shutdown adopter D2iQ Konvoy
    56cde7d2c add SystemdCgroup to default runtime options
    363e02310 install-runhcs-shim: fetch target commit instead of tags
    77905cf6f build(deps): bump go.etcd.io/bbolt from 1.4.2 to 1.4.3
    fe4ec31bc build(deps): bump github/codeql-action from 3.29.10 to 3.29.11
    f0ee598ff integration: Add test for  directives with userns
    41953f7ac cri: Fix userns with Dockerfile VOLUME mounts that need copy
    48f5d4255 script/test: clean up generated NRI test configuration.
    ad207c1ce docs: update docs for NRI v0.10.0.
    37b12bf5e Add documentation for cgroup_writable field
    b7a401f1d cri: warn about deprecated v0.1.0-style NRI plugins.
    cb9fda2e7 nri: add configuration for the default validator.
    fa820a5d0 go.{mod,sum}: update NRI to v0.10.0.
    3dbb9695a build(deps): bump github/codeql-action from 3.29.7 to 3.29.10
    da3dc1ef6 core/mount: Retry unmounting idmapped directories
    27ba690a1 core/mount: Test cleanup of DoPrepareIDMappedOverlay()
    dd7fe0b76 core/mount: Properly cleanup on doPrepareIDMappedOverlay errors
    cb56df4fb build(deps): bump the k8s group with 3 updates
    d449d94d2 build(deps): bump github.com/emicklei/go-restful/v3
    b595e0173 Update hcsshim to v0.14.0-rc.1 in preparation for containerd/2.2
    7a19c94d6 core/mount: Don't call nil function on errors
    dc38aaf6c ci:fix TestSandboxRemoveWithoutIPLeakage failed
    6dcbdcfb3 ci: add Go 1.25.0
    93c034c80 build(deps): bump actions/cache from 4.2.3 to 4.2.4
    f77717f50 build(deps): bump lycheeverse/lychee-action from 2.4.1 to 2.5.0
    a2d30ba30 build(deps): bump google.golang.org/protobuf from 1.36.6 to 1.36.7
    6e9b6eada core/mount: Only idmap once per overlayfs, not per layer
    6ce7f6d87 pkg/sys: check SupportsPidFD first
    c7f19d104 build(deps): bump the golang-x group with 2 updates
    8d275704a build(deps): bump actions/checkout from 4.2.2 to 5.0.0
    e3b2bcead build(deps): bump actions/download-artifact from 4.3.0 to 5.0.0
    5bd22a3e9 build(deps): bump github.com/containerd/go-cni from 1.1.12 to 1.1.13
    bd9e577c2 Fix ctr snapshot mount produce invalid mount command for empty option
    db31fbc5a ci: bump Go 1.24.6
    45e02e1dc sys: fix pidfd leak in UnshareAfterEnterUserns
    7340a7a28 fix: create bootstrap.json with 0644 permission
    2b48e3cb9 build(deps): bump docker/login-action from 3.4.0 to 3.5.0
    398d42313 build(deps): bump github.com/prometheus/client_golang
    aeace7daa build(deps): bump google-github-actions/auth from 2.1.11 to 2.1.12
    009625290 Block CIM snapshotter & differ
    63c9cfcc1 fix typo: collecter -> collector
    3653c911b Update mailmap for austinvazquez
    55fd29789 build(deps): bump github/codeql-action from 3.29.2 to 3.29.4
    6e0579453 build(deps): bump google-github-actions/upload-cloud-storage
    22a88c1ac build(deps): bump the k8s group with 3 updates
    83deebdd5 build(deps): bump google-github-actions/auth from 2.1.10 to 2.1.11
    a38708cc9 build(deps): bump google.golang.org/grpc from 1.73.0 to 1.74.2
    68a55252f refactor: use the built-in max/min to simplify the code
    b70b43f6b time to upgrade to 1.33 cri-tools
    4f95737e1 Remove Alpha gate from k8s e2e runs
    46325f114 Update 1.6 timeline to add an extended period
    ed174c914 cmd/ctr: rename vars that shadowed builtin
    4420b5a49 Ensure fetcher always closes body and properly calls release
    1b821ca04 fix(dockerFetcher): resolve deadlock issue in dockerFetcher open
    118a84147 ci: update crun to 1.22
    c5ad254a3 ci: bump Go 1.24.5
    0eaa09e35 Make signal notifications work on Windows
    636d29832 build(deps): bump the golang-x group with 3 updates
    dbb44287f Plumb windows CPU affinity values to runtime spec
    12daca5f6 Fix intermittent test failures on Windows CIs
    117179ae1 Remove WS2025 from CIs due to regression
    222b2d3e7 update pause image to pause:3.10.1
    e96ebc008 erofs-snapshotter: make IMMUTABLE_FL optional
    f75323f89 nri: enable otel traces in NRI.
    b641933cf erofs snapshotter: Add tar index mode
    62bbdce7f update go-md2man binary to v2.0.7
    fd464031d build(deps): bump github.com/tchap/go-patricia/v2 from 2.3.2 to 2.3.3
    e0d733c87 blockfile: Ensure required options are always set
    aed961a6f Remove additional fuzzers from CI
    24ea5f23f build(deps): bump golangci/golangci-lint-action from 6.5.2 to 8.0.0
    a0ed14fd4 erofs-differ: fix filesystem UUID for tar-converted layers
    b92e8b544 Add GitHub Action for k8s node e2e tests
    eb63b5b4d Amend runtime handler test for stable order
    c6ae08193 CRI: Stable sort for RuntimeHandlers
    f51a2fbfd Test showing RuntimeHandlers in Status() are unordered
    cc913cac6 build(deps): bump github/codeql-action from 3.29.0 to 3.29.2
    40f3b74af build(deps): bump go.etcd.io/bbolt from 1.4.1 to 1.4.2
    587c0757b build(deps): bump github.com/intel/goresctrl from 0.8.0 to 0.9.0
    35cbd7349 Fix port forward error logger to not cause concurrent write
    7a46fe7e6 Correct Commit Memory Aggregation for Windows Containers
    a4aebea4b build(deps): bump github.com/containerd/console from 1.0.4 to 1.0.5
    100b78711 build(deps): bump google.golang.org/grpc from 1.72.2 to 1.73.0
    621d661be Add coverage support for CRI integration tests
    bf1c47f5e core/runtime/v2: shimManager.cleanupWorkDirs ignore non-existing path
    d553c4014 Update GHA runners to use latest image for most jobs
    610f29914 Update garbage collection docs
    6537a61d0 Add back reference test for collectible resources
    df87a8f71 Add support for backreferences in gc
    8ecd6b6fa Update gc tests to make digests easier to identify
    cf7f4f5cc restore: skip pull for existing base image
    b671a9721 ctr:add sandbox info command to print sandbox info
    b95265124 build(deps): bump docker/setup-buildx-action from 3.11.0 to 3.11.1
    9f9ce00aa build(deps): bump the k8s group across 1 directory with 3 updates
    a79e79141 ci:fix ci TestContainerExecLargeOutputWithTTY panic
    97bbc1f73 Remove unused Windows 2019 powershell scripts
    cb53f381e fix when multipart fetching and the server does not return content length
    d3516916a Fix fetch always adding range to requests
    aea4e685e build(deps): bump github.com/urfave/cli/v2 from 2.27.6 to 2.27.7
    ed7746656 ci: bump golangci from 6.5.2 to 7.0.0
    37147b13a Disable ST1003: struct field Uid should be UID (staticcheck)
    19a713061 Disable QF1003: could use tagged switch on base (staticcheck)
    03a44a2d7 fix: Used nolint to ignore the static checks
    4ba81d429 fix: ST1001: should not use dot imports (staticcheck)
    b52997372 fix: ST1019: removed the duplicate imports
    403f86ecc fix: QF1012: Use of fmt.Fprintln(...)
    d93d18c85 fix: QF1001: could apply De Morgan's law (staticcheck)
    b3eec6d8e fix: ST1005: error strings should not end with punctuation or newlines
    1ff590004 fix: QF1004: strings.ReplaceAll instead (staticcheck)
    56516173d fix: QF1002: could use tagged switch on host (staticcheck)
    0df6d1e6b build(deps): bump docker/setup-buildx-action from 3.10.0 to 3.11.0
    4593023f1 build(deps): bump github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus
    1f288492c build(deps): bump actions/attest-build-provenance from 2.3.0 to 2.4.0
    0779c0a6d build(deps): bump softprops/action-gh-release from 2.2.2 to 2.3.2
    9b7f24610 build(deps): bump github/codeql-action from 3.28.18 to 3.29.0
    b7bda5d6e build(deps): bump go.etcd.io/bbolt from 1.4.0 to 1.4.1
    7c97cd331 build(deps): bump the golang-x group with 2 updates
    e6708bddf bugfix:close container io when runtime create failed
    4bf1705a8 Implement io.ReaderAt on docker fetch reader
    734d52c39 chore: remove specific go version code
    04ce9f884 feat: preserve nsPath on mount failure to ensure cleanup
    af068ff86 Update fetcher errors to include full registry error
    6e1f0203e Register remote errors for clients to access registry errors
    697d77676 Decode grpc errors in the transfer client proxy
    9de26f315 [e2e] add case for shim wait interface
    49664dab5 Add context in Process Wait interface
    415df3892 ci: bump Go 1.24.4 in CI
    2f1948a50 Enable CIs to run on WS2022 and WS2025
    8de612020 pkg/oci: don't use var for WithPrivileged
    cf667aa7e pkg/oci: add basic test for WithParentCgroupDevices
    d72c21450 pkg/oci: don't use vars for WithAllKnownCapabilities, WithAllCurrentCapabilities
    ac3c3ad5d pkg/oci: cleanup some tests
    4de598d94 pkg/oci: remove compatibility code for go1.16 and older
    17c632e78 pkg/oci: fix minor linting issues
    cff8184ff support image volume sub path
    a8658a708 erofs-snapshotter: fix to work with wrapped errors
    4f7c69ae6 Update differ selection in transfer service to prefer default
    21f0595b9 Add debug log when transfer returns not implemented
    d9bb00578 Add more error details when unpack fails to extract
    4dd2cd92c build(deps): bump ossf/scorecard-action from 2.4.1 to 2.4.2
    48cec3659 Update transfer supported platforms logic
    1ac97c2c1 *: properly shutdown non-groupable shims to prevent resource leaks
    128229975 Enable DuplicationSuppressor in transfer service
    00edba6aa Remove internal interface from unpacker interface
    77562a8e4 fix import for local transfer service
    a93c8d3cd build(deps): bump google.golang.org/grpc from 1.72.0 to 1.72.2
    4a2c40223 build(deps): bump lycheeverse/lychee-action from 2.4.0 to 2.4.1
    ee85517b1 docs: fix v2.1.0 release link
    e57b9f751 dep: bump up k8s.io/cri-api to 0.33.0
    a4dd2b8f2 go.mod: bump up go to 1.24.3
    b9a29bdb9 ci: bump up go to 1.24.3
    811d04422 shim-v2:improve shim error message
    6e17198f0 Add descriptor to transfer pull image events
    213337ce4 Fetch image with default platform only in TestExportAndImportMultiLayer
    aa9c17c69 Add symlink breakout test for overriden path
    78e838c34 build(deps): bump github/codeql-action from 3.28.17 to 3.28.18
    b98b99836 build(deps): bump github.com/emicklei/go-restful/v3
    fb6dd2cf1 client:improve mount error message
    8be437ee8 docs(ansible): fix the folder
    d498e690e clones k8s util exec used by streaming code removing k8s util dependencies
    6c0d36b24 follow-up changes discussed at end of review creating these packages
    b0052d94a pkg/oci: prevent panic for some platform-specific options
    ee5ad982f docs/snapshotters/erofs.md: a tip for improved performance
    5f2200b2c erofs-differ: fix EROFS native image support
    af24e463b update runhcs to v0.13.0
    7063ee659 clones vendor of k8s.io/kubelet/pkg/cri/streaming
    11efadd36 build(deps): bump github.com/vishvananda/netlink
    e29c0fe58 build(deps): bump github.com/Microsoft/hcsshim
    21215b216 build(deps): bump dario.cat/mergo from 1.0.1 to 1.0.2
    38c9bb93a Revert "perf(applyNaive): avoid walking the tree for each file in the same directory"
    1a4c32105 seccomp: kernel v6.13
    6180d6243 seccomp: kernel v6.12
    fea77e15b ci: bump golang [1.23.9, 1.24.3] in build and release
    a2f1f4a67 cri:use debug level when receive exec process exited events
    8d3eb6567 Update removal version for deprecated registry config fields
    2be7a7310 ci:fix ci timeout on almalinux
    98698617c Update internal/cri/server/container_create.go
    af05355e4 internal/container_create: if sandboxConfig's metadata is nil will panic
    bcfba26ca internal/cleanup: remove Background(), add tests for Do()
    ada7bdf19 replace "cleanup.Background" for "context.WithoutCancel"
    c4435bb48 internal/cleanup: fix package godoc
    e58bc944f core/runtime/v2: cleanup shim-cleanup logs
    9ae54175d ctr:make sure containerd socket exist before create client
    6ebe15dd4 cri:fix containerd panic when can't find sandbox extension
    8bc62da9c client/New: Don't unlazy the gRPC connection implicitly

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

1 files changed, 7 insertions, 4 deletions

diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index bae86146..081cf354 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 = "30bd62aac620aa34e6fcb826f011a41f9ca16aa1"
-SRC_URI = "git://github.com/containerd/containerd;branch=release/2.1;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
+SRCREV = "a7e49900aa74c23f294fe050f88f2bbfcdaadd2a"
+SRC_URI = "git://github.com/containerd/containerd;branch=main;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=release/2.1;protocol=ht
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v2.1.4"
+CONTAINERD_VERSION = "v2.2.0-beta.1"
 
 # EXTRA_OEMAKE += "GODEBUG=1"
 
@@ -59,7 +59,10 @@ do_compile() {
     #        ... recipe-sysroot-native/usr/lib/aarch64-poky-linux/go/pkg/tool/linux_amd64/link:
     #        cannot open file : open : no such file or directory
     export GO_BUILD_FLAGS="-trimpath -a -pkgdir dontusecurrentpkgs"
-    export GO111MODULE=off
+    # As of v2.2.0+ the GO11MODULE setting breaks the build (linking errors). It doesn't
+    # seem necessary anymore. Leaving it here for now as a breakcrumb if other errors pop
+    # up
+    # export GO111MODULE=off
 
     cd ${S}