containerd: update to v1.6.9

Bumping containerd to version v1.6.9-12-g6c41694da, which comprises the following commits:

    5af8d89ce overlayutils: Add fastpath for userxattr check
    303f608dd [release/1.6] update to Go 1.18.8 to address CVE-2022-41716
    3f9f9508d ctr export strictly match default platform
    df73acad5 [release/1.6] go.mod: Bump hcsshim to v0.9.5
    658490b78 ctr import: strictly match platform
    4907b4d72 Migrate away from GitHub actions set-output
    f1493f665 Prepare release notes for v1.6.9
    346412f5a adding support of CAP_BPF and CAP_PERFMON
    99578d1fc Update mailmap
    a956d8415 Add logging volume metrics to Containerd CRI plugin
    29e2dea50 fix pusher concurrent close channel
    8a9d69385 [release/1.6] Stats() shouldn't assume s.container is non-nil
    a9adc7938 cri: PodSandboxStatus should tolerate missing task
    b66eb726a migrate from k8s.gcr.io to registry.k8s.io
    5b40993a5 [release/1.6] upgrade containerd/continuity from v0.2.2 to v0.3.0
    f2376e659 Update container with sandbox metadata after NetNS is created
    06f82efef archive: validate digests before use
    28324c529 [release/1.6] Update go 1.18.7, addresses CVE-2022-2879, CVE-2022-2880, CVE-2022-41715
    0aeeb62cb [release/1.6] update golangci-lint to v1.19.0
    7db9d1f76 Fix linter warnings
    4dc932e62 [release/1.6] gofmt with go1.19
    7b8d679ad [release/1.6] integration: remove use of deprecated io/ioutil
    926b9c72f retry request on writer reset
    b9a35c6af Add integration tests with failpoint
    1f29fac48 Persist container and sandbox if resource cleanup fails, like teardownPodNetwork
    a85709c6c integration: simplify CNI-fp and add README.md
    d89a8d223 pkg/failpoint: add FreeBSD link and update pkg doc
    b0ce2965a integration: Add injected failpoint testing for RunPodSandbox
    a7f956d86 integration: CNI bridge wrapper with failpoint
    07c479471 pkg/failpoint: add DelegatedEval API
    4a5bc05aa runtime/v2/shim: return if error in load plugin
    71ee7de24 bin/ctr,integration: new runc-shim with failpoint
    3e2e77849 runtime/v2: manager supports server interceptor
    cb935bf49 pkg/failpoint: init failpoint package
    2fdfd564c make xattr EPERM non-fatal in createTarFile
    89e49609d remotes/docker/config: Skipping TLS verification for localhost
    b720be2ce remove stray .zuul.yaml
    6b30bc4b4 .zuul: remove the zuul because it is offline
    0f7e258ee Set grpc code for unimplemented cri-api methods
    fb753e5cd update intergration
    6ee5bb7ea bump cri-api
    ae8598615 ContainerStatus to return container resources
    d3c7e31c8 Update CRI-API
    5b44c5271 vendor: golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
    3507d600b update runc binary to v1.1.4
    1efd8b947 ci: remove GOPROXY environment variable due to https://github.com/go-yaml/yaml/issues/887

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

1 files changed, 3 insertions, 3 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 8847f31f..e95ca175 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -5,7 +5,7 @@ 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 = "579a6380ec93ab92a6e7f26167fe4f18dfcf2a4b"
+SRCREV = "6c41694da9eb09c2f1f49a5a5fbec4e970cfb460"
 SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https;destsuffix=git/src/github.com/containerd/containerd \
            file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
            file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \
@@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v1.6.8"
-CVE_VERSION = "1.6.8"
+CONTAINERD_VERSION = "v1.6.9"
+CVE_VERSION = "1.6.9"
 
 # EXTRA_OEMAKE += "GODEBUG=1"