Make containerd work with read-only root
This makes containerd work with a read-only root. There were a few config mistakes on our side which
caused it to write to the rootfs (mostly leftovers from the switch to /ephemeral) and a semi-hardcoded path
in /var/lib/cni from containernetworking/cni. This is technically configurable, but it would require patching
three different repos (see diff message) and getting all of them to agree to take the change and wait for
it to propagate to all repos (containerd is known to be slow to release stuff). So let's just hack in
this one-line diff for the time being.
Test Plan: Should be covered by existing tests
X-Origin-Diff: phab/D694
GitOrigin-RevId: 0e8f5dbfb216539c16e64130af9fe1023722ae1b
diff --git a/build/fietsje/deps_containerd.go b/build/fietsje/deps_containerd.go
index 09db846..6154960 100644
--- a/build/fietsje/deps_containerd.go
+++ b/build/fietsje/deps_containerd.go
@@ -36,7 +36,6 @@
"github.com/containerd/imgcrypt",
"github.com/containers/ocicrypt",
"github.com/containerd/typeurl",
- "github.com/containernetworking/cni",
"github.com/coreos/go-systemd/v22",
"github.com/cpuguy83/go-md2man/v2",
"github.com/davecgh/go-spew",
@@ -86,10 +85,12 @@
"gopkg.in/yaml.v2",
"k8s.io/klog/v2",
"sigs.k8s.io/yaml",
+ ).with(disabledProtoBuild, patches("containerd-netns-statedir.patch")).use(
+ "github.com/containerd/cri",
).with(disabledProtoBuild).use(
"github.com/Microsoft/hcsshim",
"github.com/containerd/cgroups",
- "github.com/containerd/cri",
+
"github.com/gogo/googleapis",
).with(buildTags("selinux")).use(
"github.com/opencontainers/selinux",
@@ -98,7 +99,9 @@
"ttrpc-hacks.patch",
)).use(
"github.com/containerd/ttrpc",
- ).replace(
+ ).with(patches(
+ "cni-fix-cachepath.patch",
+ )).use("github.com/containernetworking/cni").replace(
// ttrpc is broken by go protobuf v2, this is a tentative PR that's
// not yet merged by upstream.
// See: https://github.com/containerd/ttrpc/pull/67