From 67083dc89b6cb7c5909031a4a892c5e0c33aa8df Mon Sep 17 00:00:00 2001 From: Predrag Rogic Date: Wed, 9 Aug 2023 21:44:04 +0100 Subject: [PATCH 1/2] fix cannot enter cgroupv2 "/sys/fs/cgroup/docker" with domain controllers --- deploy/prow/wrapper.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/deploy/prow/wrapper.sh b/deploy/prow/wrapper.sh index c52f37da69..83ce6fd026 100755 --- a/deploy/prow/wrapper.sh +++ b/deploy/prow/wrapper.sh @@ -52,6 +52,20 @@ early_exit_handler() { trap early_exit_handler TERM INT +# prevent 'cannot enter cgroupv2 "/sys/fs/cgroup/docker" with domain controllers -- it is in threaded mode: unknown' error +# ref: https://github.com/containerd/containerd/issues/6659#issuecomment-1064754423 +# ref: https://github.com/moby/moby/blob/89b542b421f439b3c703098f7f1c29f661e430bb/hack/dind#L28-L38 +# cgroup v2: enable nesting +if [ -f /sys/fs/cgroup/cgroup.controllers ]; then + # move the processes from the root group to the /init group, + # otherwise writing subtree_control fails with EBUSY. + # An error during moving non-existent process (i.e., "cat") is ignored. + mkdir -p /sys/fs/cgroup/init + xargs -rn1 < /sys/fs/cgroup/cgroup.procs > /sys/fs/cgroup/init/cgroup.procs || : + # enable controllers + sed -e 's/ / +/g' -e 's/^/+/' < /sys/fs/cgroup/cgroup.controllers \ + > /sys/fs/cgroup/cgroup.subtree_control +fi >&2 echo "wrapper.sh] [SETUP] Docker in Docker enabled, initializing ..." # If we have opted in to docker in docker, start the docker daemon, From 14aeebe10a086a8ede5264a10c3d9241e60716e7 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Thu, 10 Aug 2023 13:02:05 -0700 Subject: [PATCH 2/2] update prow version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0aee7fcb27..f5361b3d19 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ GVISOR_TAG ?= latest AUTOPAUSE_HOOK_TAG ?= v0.0.4 # prow-test tag to push changes to -PROW_TEST_TAG ?= v0.0.4 +PROW_TEST_TAG ?= v0.0.5 BUILDX_BUILDER ?= multiarch