From 6ff3675810a536656ccc1a5125b27786a6594292 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 8 Jun 2022 15:42:11 +0200 Subject: [PATCH 1/4] coreos-base/coreos-init: bump commit ID this pulls kubernetes module configuration. Signed-off-by: Mathieu Tortuyaux --- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index fa7fd86e34..9da3fcebfe 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="b9c0bc0f57c2c19122c1ec1c7fb44a2e156d311e" # flatcar-master + CROS_WORKON_COMMIT="a4f4ec3a1fab6a75f12c39ddf53da6eef9fbd098" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From 250760a51be2b5ecf023bd956aafefea057a38fe Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 8 Jun 2022 15:30:52 +0200 Subject: [PATCH 2/4] app-emulation/containerd: enable containerd `docker.service` has a dependency to `containerd.service`: ``` $ systemctl list-dependencies docker.service docker.service containerd.service ... ``` If `docker.service` is not started (explicitly or via socket activation) `containerd.service` won't start. To ensure a seamless transition to kubernetes-1.24 let's enable by default `containerd.service`. Signed-off-by: Mathieu Tortuyaux --- .../app-emulation/containerd/containerd-9999.ebuild | 1 + .../app-torcx/docker/files/docker-20.10-manifest.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 078672d88e..147c4652d5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -62,6 +62,7 @@ src_compile() { src_install() { dobin bin/containerd{-shim,-shim-runc-v*,} bin/ctr systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service" + systemd_enable_service multi-user.target "${PN}.service" insinto /usr/share/containerd doins "${FILESDIR}/config.toml" doins "${FILESDIR}/config-cgroupfs.toml" diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json index 190f9e8538..418acbdcd9 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json @@ -23,7 +23,8 @@ "/lib/systemd/system/containerd.service", "/lib/systemd/system/docker.service", "/lib/systemd/system/docker.socket", - "/lib/systemd/system/sockets.target.wants" + "/lib/systemd/system/sockets.target.wants", + "/lib/systemd/system/multi-user.target.wants" ] } } From 506403adf42501b2a7ca2b5006d36efe18745894 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 9 Jun 2022 17:27:30 +0200 Subject: [PATCH 3/4] app-emulation/containerd: remove `overlay` module loading This is now handled in `flatcar-linux/init` repo in the `modules-load.d` config directory. Signed-off-by: Mathieu Tortuyaux --- .../app-emulation/containerd/files/containerd-1.0.0.service | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service index d5508823e4..ac2b18d806 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service @@ -8,7 +8,6 @@ Delegate=yes Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml ExecStartPre=mkdir -p /run/docker/libcontainerd ExecStartPre=ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock -ExecStartPre=-/sbin/modprobe overlay ExecStart=/usr/bin/containerd --config ${TORCX_UNPACKDIR}${TORCX_IMAGEDIR}${CONTAINERD_CONFIG} KillMode=process Type=notify From 9d2c1239789d640f2f1f44b6ef0fdb5de2b71f77 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 16 Jun 2022 13:59:38 +0200 Subject: [PATCH 4/4] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/changelog/changes/2022-06-16-kubernetes.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-16-kubernetes.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-16-kubernetes.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-16-kubernetes.md new file mode 100644 index 0000000000..d615197052 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-16-kubernetes.md @@ -0,0 +1 @@ +- Enabled `containerd.service` unit, `br_netfilter` and `overlay` modules by default to follow Kubernetes requirements ([coreos-overlay#1944](https://github.com/flatcar-linux/coreos-overlay/pull/1944), [init#72](https://github.com/flatcar-linux/init/pull/72))