containerd: update to v2.0.0-rc.1

Bumping containerd to version v2.0.0-rc.1-8-g0426e3c2e, which comprises the following commits:

    c27bcdc56 cri: introspectRuntimeFeatures: fix nil panic
    c5ba71d11 Makefile: update default PACKAGE to v2
    094bafe2a apparmor: Allow confined runc to kill containers
    e461a59ae fix migrateConfig for io.containerd.cri.v1.images
    eb5a0c04b apparmor: add `signal (receive) peer=/usr/local/bin/rootlesskit,`
    5e470e1ca Update HTTPFallback to handle tls handshake timeout
    a37b451cd build(deps): bump tags.cncf.io/container-device-interface
    888fd315f Update CNI to v1.2.0
    13e6b2b68 update to go1.21.9, go1.22.2
    42e4de9c5 Prepare release notes for v2.0.0-rc.1
    4a31bd606 chore: use errors.New to replace fmt.Errorf with no parameters will much better
    a6a82c102 Update hcsshim to v0.12.3
    7e60d5a07 Account for ipv4 vs ipv6 localhost in windows port forwarding
    a153b2cd3 mod: bump github.com/containerd/nri@v0.6.1
    77512e2d7 build(deps): bump the golang-x group with 3 updates
    c8d9eba7c build(deps): bump github.com/klauspost/compress from 1.17.7 to 1.17.8
    1c0f73aa0 build(deps): bump github.com/pelletier/go-toml/v2 from 2.2.0 to 2.2.1
    32caaee48 Snapshotters: Export the root path
    b82ced57f fix: close profile
    c7ea06a69 fix default working directory `hostProcess`
    1040c7b98 build(deps): bump the otel group with 8 updates
    b50e9eae4 Refactor spots to make use of sys.IgnoringEintr
    3ea69db8e Add helper to ignore eintr
    1b6222418 Bump tags.cncf.io/container-device-interface to v0.7.1
    ad584ebec Replace direct waitid syscall with unix.Waitid
    7c5078459 Remove empty default tls configuration in ctr
    b6e361694 cri: add pause image name to annotations
    0ec14fdf8 core/diff/apply: use unix.Syncfs
    739659a4b build(deps): bump google.golang.org/grpc from 1.62.1 to 1.63.2
    433279438 Transfer: Registry: Enable plain HTTP
    88b4cc659 address review comments
    f20c49311 Update tracing documentation to add details about manual instrumentation
    63d5573a3 remote: Fix HTTPFallback fails when pushing manifest
    2474a99c3 Add IsNotFound case to ListPodSandboxStats
    3830f8167 fix(cri): fix unexpected order of mounts since go 1.19
    cbb644182 build(deps): bump github.com/Microsoft/hcsshim from 0.12.0 to 0.12.2
    362fcf2d2 build(deps): bump github.com/distribution/reference from 0.5.0 to 0.6.0
    5b6ae0f79 Use different containerd sock address in tests
    ab2c569fb ctr: fix parsing mount options
    b97ef91fb Change port forwarding on windows
    ea681afba docs: fix typo
    6d00c3ada runc-shim: only defer init process exits
    da4ca4949 build(deps): bump github.com/pelletier/go-toml/v2 from 2.1.1 to 2.2.0
    dd72fb3b2 build(deps): bump github.com/intel/goresctrl from 0.6.0 to 0.7.0
    e41e9e11b transfer: Platform matcher should match multiple platforms
    d0d35f0d0 core/images/archive: normalizeReference: remove outdated TODO
    26158609b pkg/seutil: move to internal/cri
    33732bc13 pkg/systemd: move to internal/cri
    0d0850af1 Prepare v2.0.0-rc.0
    f5abb63c0 Update mailmap
    30813f646 build(deps): bump github.com/containernetworking/plugins
    0fafc0c50 build(deps): bump github.com/checkpoint-restore/go-criu/v7
    7c1fca096 Update migration script based on usage
    45e425ccc vendor: github.com/golang/protobuf v1.5.4
    4aa6fedd5 CRI: postpone removal of deprecated config properties
    34c545824 Automatically decompress archives for transfer service import
    df26c189a Clean cri options and useless parms
    88421068f Fix invalid event filter in podsandbox
    357c59b79 Update github actions ci to run on forks
    4b719cc4b build(deps): bump google.golang.org/grpc from 1.62.0 to 1.62.1
    10c7f03b3 build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0
    21d3fedf4 build(deps): bump softprops/action-gh-release from 1 to 2
    228aa42a6 build(deps): bump the otel group with 8 updates
    47d13767f Clean typos in plugins.
    7ac9d6909 Use the Go toolchain in CI matrix to build binaries
    6a96e4501 Move shim package to pkg
    f25770e48 Wire through CRI ContainerCheckpoint RPC
    7ecdebff9 update to go 1.21.8, 1.22.1
    723306d0e Disable OOM set score unpriv test temporarily
    994fdd74e Don't create new scratch VHD per image for CimFS
    016b588a9 build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0
    d9409c461 Update hcsshim to v0.12.0
    00d714e90 build(deps): bump the golang-x group with 2 updates
    ab4de3e4c build(deps): bump azure/login from 1 to 2
    713dd8f8d go.mod: k8s.io/cri-api v0.30.0-alpha.3
    d9b9160ae mv internal/testutil pkg/testutil
    752917c0f build(deps): bump github.com/prometheus/client_golang
    7a3b7fba5 Transfer: Registry: Enable to use registry configuration diretory
    1bf781d8e Cleanup introspection interface
    5bd204109 Remove grpc from Client connection interface
    347346e3c Add ttrpc support to content proxy
    9104e6a24 Add events proxy interface
    892dc54bd runc-shim: process exec exits before init
    9128ee0a9 Move nri packages to plugin and internal
    d0da3d1ca sandbox: make event monitor in CRI independent
    17ea3959b adds mediatype to oci index record
    c5ef8a2c2 fix(docs): fix duplicate instructions for windows installation
    87e8e9c7f Add Go client stability in releases for 2.0.
    72f21833b Move events to plugins and core
    caa9e2075 add k8s 1.29 and 1.30preview to support table
    154ed26a7 vendor: go.etcd.io/bbolt v1.3.9
    6d1dfe55f cri: ensure the pause image loaded in older versions is pinned
    2884b318f build(deps): bump github.com/klauspost/compress from 1.17.6 to 1.17.7
    bd44df8a1 refactor code - clean switch and if statements
    a60e52f58 sandbox: add struct tags for PinnedImages
    a0b73ae11 sandbox: optimize the lock in PodSandbox
    0f1d27412 sandbox: add methods to sandboxService
    a2768f19d plugins/sandbox: move local plugin into services
    d651cb743 mediatypes: support zstd compression

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

2 files changed, 2 insertions, 31 deletions

diff --git a/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch b/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch
deleted file mode 100644
index 74e313b5..00000000
--- a/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eb39888898a9d196e3eb63724c6c07777f3b9402 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 24 Apr 2024 14:10:11 +0800
-Subject: [PATCH] Makefile: update default PACKAGE to v2
-
-Upstream-Status: Submitted [https://github.com/containerd/containerd/pull/10125]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a5b244191..cb9ff4172 100644
---- a/Makefile
-+++ b/Makefile
-@@ -34,7 +34,7 @@ TEST_IMAGE_LIST ?=
- # Used to populate variables in version package.
- VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
- REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
--PACKAGE=github.com/containerd/containerd
-+PACKAGE=github.com/containerd/containerd/v2
- SHIM_CGO_ENABLED ?= 0
- 
- ifneq "$(strip $(shell command -v $(GO) 2>/dev/null))" ""
--- 
-2.25.1
-
diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index 4d900d01..ef1de98d 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -5,18 +5,17 @@ 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 = "b1624c3628954e769dd50783b63823040b2db38c"
+SRCREV = "0426e3c2eb39b246f783cb16d0980ed9e0e69563"
 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://0001-Makefile-update-default-PACKAGE-to-v2.patch \
           "
 
 # Apache-2.0 for containerd
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v2.0.0-beta.0"
+CONTAINERD_VERSION = "v2.0.0-rc.1"
 CVE_VERSION = "v2.0.0-beta.0"
 
 # EXTRA_OEMAKE += "GODEBUG=1"