Pull request #125: Feature/k3s

Merge in ICO/coreos from feature/k3s to master

* commit 'af33b55ec07b3d78cd5e2e2ea2e677b226a441a3':
  feat(k3s): image that installs the k3s-agent
  feat(linux-yocto_5.15): add kernel config for k3s
This commit is contained in:
Uli Stein 2023-09-15 14:38:18 +02:00
commit f0e6da1c10
3 changed files with 17 additions and 0 deletions

View File

@ -0,0 +1,8 @@
#this file contains the necssary kernel adaption that k3s an containerd require
#Reference
#k3s config check: https://raw.githubusercontent.com/k3s-io/k3s/master/contrib/util/check-config.sh
#container config check: https://raw.githubusercontent.com/moby/moby/master/contrib/check-config.sh
#these scripts are provided by moby and rancher
CONFIG_OABI_COMPAT=n
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y

View File

@ -1,3 +1,4 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
KMACHINE:vm-x64 ?= "common-pc-64" KMACHINE:vm-x64 ?= "common-pc-64"
COMPATIBLE_MACHINE:vm-x64 = "vm-x64" COMPATIBLE_MACHINE:vm-x64 = "vm-x64"
@ -11,3 +12,5 @@ COMPATIBLE_MACHINE:beaglebone = "beaglebone"
LINUX_VERSION:beaglebone = "5.15.54" LINUX_VERSION:beaglebone = "5.15.54"
require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)} require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)}
SRC_URI += " file://k3s_kernel_adaptions.cfg"

View File

@ -0,0 +1,6 @@
DESCRIPTION = "An image that includes k3s-agent"
require recipes-core/images/coreos-image-all-features.bb
IMAGE_INSTALL += "k3s-agent"