From 1589b430e31ac065936609f620ccfee803d81ccf Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 22 Nov 2021 09:29:22 -0500 Subject: cri-o: update to 1.22.1 Bumping cri-o to version v1.22.1-5-ge3dfe61ca, which comprises the following commits: d89a55e91 gh-actions: add sed for kube e2e b1ac0896f release-notes: update to main a90fcad56 test: add label for openshift e2e in dockerfile 1495b80e8 bump to 1.22.1 4ce3396b9 Skip volume relabel for super privileged containers 66e3210e0 test: skip certificate check for downloading parallel 91acfb2e7 test: fix shmft 325ec64d5 vendor: update to selinux 1.9.1 8bacf3132 test: fix selinux test failures 116eff337 server: FilterDisallowedAnnotations of containers earlier e595eeb06 server: conditionally relabel volumes given annotation 69dfc4bc4 test: refactor allowed_annotation tests 92810c137 server: reduce args in addOCIBindMounts 54f343719 server: mount cgroup if hostNetwork b40d9220b server: use container level host network setting 53755727a server: don't recalculate hostnet a220ddf71 server: set spec when dropping infra 85043dab6 server: don't wait forever on conmon cgroup move fail 764e83f44 Do not log if Intel RDT is not supported 4542e5166 call cmd.Wait() in all cases we call Start() 2bd8e315b oci: call wait on conmon if cgroup move fails d45f1f112 Fix missing quantile in `latency_microseconds_total` metrics 6a8cb41cd oci: use conmon for exec again ddef4d063 install dependency in test step f74d274fa blockio: apply annotations and blockio classes to Linux.Resources 7b3f68fa8 blockio: handle class configuration file if set d7444c86d blockio: enable setting blockio class configuration file 5aacbedb2 fix checking in openpgp_tag.sh 2bfcfb6fb config: set internal_wipe to true by default, and deprecate the option Signed-off-by: Bruce Ashfield --- recipes-containers/cri-o/cri-o_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb index b93c3deb..9a847ef2 100644 --- a/recipes-containers/cri-o/cri-o_git.bb +++ b/recipes-containers/cri-o/cri-o_git.bb @@ -14,9 +14,9 @@ At a high level, we expect the scope of cri-o to be restricted to the following - Resource isolation as required by the CRI \ " -SRCREV_cri-o = "1d447191ee73ead59f344f354edac5d64f377e15" +SRCREV_cri-o = "e3dfe61cafa3922bf7ad9b0a2ac3dc7e6873209b" SRC_URI = "\ - git://github.com/kubernetes-sigs/cri-o.git;branch=main;name=cri-o;protocol=https \ + git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.22;name=cri-o;protocol=https \ file://0001-Makefile-force-symlinks.patch \ file://crio.conf \ " @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2 GO_IMPORT = "import" -PV = "1.22.0+git${SRCREV_cri-o}" +PV = "1.22.1+git${SRCREV_cri-o}" inherit features_check REQUIRED_DISTRO_FEATURES ?= "seccomp" -- cgit v1.2.3-54-g00ecf