ZeroDownTime/alpine-overlay
3
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix: make containerd v2 use crun, new config

Browse Source
This commit is contained in:
Stefan Reimer 2025-02-05 12:35:42 +00:00
parent d746652970
commit a1ff0652a2
7 changed files with 82 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kubezero/containerd/APKBUILD
View File

@ -4,14 +4,15 @@
pkgname=containerd
# NOTE: containerd's Makefile tries to get REVISION from git, but we're building from a tarball.
_commit=88aa2f531d6c2922003cc7929e51daf1c14caa0a
pkgver=2.0.1
_commit=207ad71
pkgver=2.0.0
pkgrel=1337
pkgdesc="An open and reliable container runtime"
url="https://containerd.io/"
arch="all"
license="Apache-2.0"
depends="runc"
# we use crun
#depends="runc"
makedepends="btrfs-progs-dev go go-md2man libseccomp-dev log_proxy"
subpackages="
$pkgname-ctr
@ -126,7 +127,7 @@ stress() {
}
sha512sums="
7875eee0fb274545acb4d62f5bca808105580177db6007e59164fd57830ea3e8ab646b8e227027016bf8dd4816341d38a620bfef48bb0fd83de006b1a91826b7 containerd-2.0.1.tar.gz
b1a89c4c53db2c69757bc40d90d585e2662ab4fffb28acb904f9710b281a9f22273ecdbab49250b229bf95b29cf1a33a352afb81967db7580ae209a83c5fb2ea containerd-2.0.0.tar.gz
75a882a95167578bb4f289822256e770ecf2f74d7a50181e622c15e847383120d3622100e5e5629b94b58e2082f990de1cc3daa2f69b0ee48827072c1e9dde0e containerd.confd
8315a8d58b4ba7e19ebed2cd82c7b5eaab45da630f9818a9e6cc8f3c8e88f159432474299798f79e6e465e843c91c0f50df04030083c8913c385ea1d73e81e6a containerd.initd
a10a1e1b5deea30c156a786592bfc54597bcf2d45c4e6447182b72a7d0a5e2eb058698a8830dbace95e71176aa3070d123bcf75c4c4a36d814182c5d24fe9d71 config.toml

6
kubezero/containerd/config.toml
View File

@ -2,7 +2,5 @@ version = 3
imports = ["/etc/containerd/conf.d/*.toml"]
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
[plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "/usr/libexec/cni"
[plugins.'io.containerd.cri.v1.runtime'.cni]
bin_dir = '/usr/libexec/cni'

4
kubezero/kubernetes/APKBUILD
View File

@ -5,7 +5,7 @@
# Contributor: Dave <dj.2dixx@gmail.com>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=kubernetes
pkgver=1.31.4
pkgver=1.31.5
pkgrel=0
pkgdesc="Container Cluster Manager"
url="https://kubernetes.io/"
@ -146,7 +146,7 @@ zshcomp() {
}
sha512sums="
74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6 kubernetes-1.31.4.tar.gz
6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96 kubernetes-1.31.5.tar.gz
5427c2e653504cfd5b0bcaf195d4734ee40947ddfebc9f155cd96dddccfc27692c29d94af4ac99f1018925b52995c593b584c5d7a82df2f185ebce1a9e463c40 make-e2e_node-run-over-distro-bins.patch
94d07edfe7ca52b12e85dd9e29f4c9edcd144abc8d120fb71e2a0507f064afd4bac5dde30da7673a35bdd842b79a4770a03a1f3946bfae361c01dd4dc4903c64 make-test-cmd-run-over-hyperkube-based-kubectl.patch
e690daff2adb1013c92124f32e71f8ed9a18c611ae6ae5fcb5ce9674768dbf9d911a05d7e4028488cda886e63b82e8ac0606d14389a05844c1b5538a33dd09d1 kube-apiserver.initd

14
kubezero/kubezero/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=kubezero
pkgver=1.31.4
_containerd=2.0.1-r1337
pkgver=1.31.5
_containerd=2.0.0-r1337
_ecr=1.31.4
_iam=0.6.29
@ -32,10 +32,10 @@ subpackages="
$pkgname-imagecache
"
IMAGES="
quay.io/cilium/cilium:v1.16.5
ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.3
"
IMAGES=""
# quay.io/cilium/cilium:v1.16.6
# ghcr.io/k8snetworkplumbingwg/multus-cni:v4.1.4
# "
#multus_version="4.0.2"
@ -94,6 +94,6 @@ ecb33fc3a0ffc378723624858002f9f5e180e851b55b98ab6611ecc6a73d4719bc7de240f87683fc
fce1013f7b1bfa8ee526de62e642a37fda3168889723e873d3fb69e257f4caa1423b5a14b9343b12a87f3b6f93c7d3861b854efda67ef2d6a42a5ca8cf3d1593 evictLocalNode.sh
92499ec9a8b3634c42b16c01d27f1c1bb650bcc074a2c8d9d16cfe2ea08942948989c6aae79bd2df562ff17df11bbc329e0971f15c4e64f944457825dee7aa79 credential-provider.yaml
8b81eb0fb66e6a739965db6af6a31c443e8f612c06146bd51107372abd833b527423299ee11b27e011f46cfbee11415234b3fa0dea695dbbb06711e0ad58f08d kubelet.monit
d70366f629ea560174858e3746c66cbe31f1d11925fc8a608ff4d7306b795bfb1ed698a10b8422f2c3dda46f5e8a02ffe3cba2fc817ac8c877344778481b7836 containerd.conf
dad818ca88a6b3404b155f145522ac07217f6812bdd3282f850ee84fdd94f602c857b62bb769a3e0273991b29a2cb9e8f57e005233c31a4171642b637e270f6c containerd.conf
b112ffd86f095aec47bf75179659af20720792c453d6cc9d11db26446aa2f3c237fe59b793dd8ef3ee93f6fd4230ff8abadfdada76e6452779b982a71eb37cb9 crictl.yaml
"

49
kubezero/kubezero/containerd.conf
View File

@ -2,38 +2,27 @@ version = 3
oom_score = -999
[plugins]
[plugins."io.containerd.grpc.v1.cri"]
enable_cdi = true
sandbox_image = "registry.k8s.io/pause:3.9"
tolerate_missing_hugetlb_controller = false
[plugins.'io.containerd.cri.v1.images'.pinned_images]
sandbox = 'registry.k8s.io/pause:3.10'
[plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "/usr/libexec/cni"
[plugins.'io.containerd.cri.v1.images'.registry]
config_path = '/etc/containerd/certs.d'
[plugins."io.containerd.grpc.v1.cri".containerd]
default_runtime_name = "crun"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.crun]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.crun.options]
BinaryName = "/usr/bin/crun"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia]
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia.options]
BinaryName = "/usr/bin/nvidia-container-runtime"
[plugins."io.containerd.grpc.v1.cri".registry]
config_path = "/etc/containerd/certs.d"
[plugins."io.containerd.runtime.v1.linux"]
runtime = "crun"
[plugins."io.containerd.monitor.v1.cgroups"]
no_prometheus = true
[plugins.'io.containerd.monitor.v1.cgroups']
no_prometheus = true
[plugins.'io.containerd.cri.v1.runtime']
tolerate_missing_hugetlb_controller = false
[plugins.'io.containerd.cri.v1.runtime'.containerd]
default_runtime_name = 'crun'
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes]
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.crun]
runtime_type = 'io.containerd.runc.v2'
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.crun.options]
BinaryName = '/usr/bin/crun'
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.nvidia]
runtime_type = 'io.containerd.runc.v2'
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.nvidia.options]
BinaryName = '/usr/bin/nvidia-container-runtime'

46
kubezero/multus-cni/APKBUILD Normal file
View File

@ -0,0 +1,46 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=multus-cni
pkgver=4.1.4
pkgrel=0
pkgdesc="Multus CNI"
url="https://github.com/k8snetworkplumbingwg/multus-cni"
arch="x86_64 aarch64"
license="Apache-2.0"
makedepends="go bash"
options="!check chmod-clean net"
source="$pkgname-$pkgver.tar.gz::https://github.com/k8snetworkplumbingwg/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
export CGO_ENABLED=0
export GO111MODULE=on
build() {
DEST_DIR="bin"
LDFLAGS="-X gopkg.in/k8snetworkplumbingwg/multus-cni.v4/pkg/multus.version=v$pkgver"
# echo "Building multus"
# go build -o ${DEST_DIR}/multus ${BUILD_ARGS} -ldflags "${LDFLAGS}" "$@" ./cmd/multus
echo "Building multus-daemon"
go build -o "${DEST_DIR}"/multus-daemon ${BUILD_ARGS} -ldflags "${LDFLAGS}" ./cmd/multus-daemon
echo "Building multus-shim"
go build -o "${DEST_DIR}"/multus-shim ${BUILD_ARGS} -ldflags "${LDFLAGS}" ./cmd/multus-shim
# echo "Building install_multus"
# go build -o "${DEST_DIR}"/install_multus ${BUILD_ARGS} -ldflags "${LDFLAGS}" ./cmd/install_multus
# echo "Building thin_entrypoint"
# go build -o "${DEST_DIR}"/thin_entrypoint ${BUILD_ARGS} -ldflags "${LDFLAGS}" ./cmd/thin_entrypoint
echo "Building kubeconfig_generator"
go build -o "${DEST_DIR}"/kubeconfig_generator ${BUILD_ARGS} -ldflags "${LDFLAGS}" ./cmd/kubeconfig_generator
# echo "Building cert-approver"
# go build -o "${DEST_DIR}"/cert-approver ${BUILD_ARGS} -ldflags "${LDFLAGS}" ./cmd/cert-approver
}
package() {
install -Dm755 "bin/multus-daemon" "$pkgdir"/usr/sbin/multus-daemon
install -Dm755 "bin/multus-shim" "$pkgdir"/usr/libexec/cni/multus
install -Dm755 "bin/kubeconfig_generator" "$pkgdir"/usr/sbin/multus-kubeconfig_generator
}
sha512sums="
4655e9956a557132ae67c80d0f1d7aa3a99ce060a8f218560ba2b531098ac8269009740291e8cb90a3610eb910551483d8f5f9460aeed7ad892c4200ec670005 multus-cni-4.1.4.tar.gz
"

2
kubezero/nvidia-container-toolkit/APKBUILD
View File

@ -4,7 +4,7 @@
pkgname=nvidia-container-toolkit
pkgver=1.17.0
pkgrel=0
pkgdesc="NVIDIA Container toolkit incl. cri hooks"
pkgdesc="NVIDIA Container toolkit"
url="https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/overview.html"
arch="x86_64"
license="Apache"