Merge pull request #1944 from flatcar-linux/coreos-overlay

add default kubernetes configuration
flatcar-archive · Jun 30, 2022 · 54c08a5 · 54c08a5
2 parents 66472d5 + b420cbb
commit 54c08a5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/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/app-emulation/containerd/files/containerd-1.0.0.service b/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

diff --git a/app-torcx/docker/files/docker-20.10-manifest.json b/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"
         ]
     }
 }
diff --git a/changelog/changes/2022-06-16-kubernetes.md b/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))
diff --git a/coreos-base/coreos-init/coreos-init-9999.ebuild b/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="bc7ddf11205177c1adc5c99046d6adc390eb9343" # flatcar-3139
+	CROS_WORKON_COMMIT="e5314a555bb241e670baefce58ed068a1547d70f" # flatcar-3139
 	KEYWORDS="amd64 arm arm64 x86"
 fi
Original file line number	Diff line number	Diff line change
		@@ -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))