mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 09:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1944 from flatcar-linux/tormath1/k-124

Browse Source 
add default kubernetes configuration
This commit is contained in:
Mathieu Tortuyaux 2022-06-16 17:54:29 +02:00 committed by GitHub
commit 91b6f33fcd
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild vendored
View File

@ -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"

1
sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/files/containerd-1.0.0.service vendored
View File

@ -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

3
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json vendored
View File

@ -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"
]
}
}

1
sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-16-kubernetes.md vendored Normal file
View File

@ -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))

2
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild vendored
View File

@ -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