From 6d89af94daec3c9e8b542ff45a1b140d1c9351d9 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 23 Jun 2025 14:43:13 +0000 Subject: [PATCH] feat: Kubernetes v1.32.6 --- kubezero/kubernetes/APKBUILD | 2 +- kubezero/kubezero/APKBUILD | 3 ++- kubezero/kubezero/kubezero.post-install | 18 ++++++++++++++++++ kubezero/zdt-base/APKBUILD | 4 ++-- kubezero/zdt-base/common.sh | 2 +- kubezero/zdt-base/xdg-runtime-dir-profile.sh | 8 ++++++++ kubezero/zdt-base/zdt-profile.sh | 1 + 7 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 kubezero/kubezero/kubezero.post-install create mode 100644 kubezero/zdt-base/xdg-runtime-dir-profile.sh diff --git a/kubezero/kubernetes/APKBUILD b/kubezero/kubernetes/APKBUILD index 249123e..d144cf7 100644 --- a/kubezero/kubernetes/APKBUILD +++ b/kubezero/kubernetes/APKBUILD @@ -147,7 +147,7 @@ zshcomp() { } sha512sums=" -b62860af0f30972fe63bcff9f9be03223331fabfc5d9f202f59adb57ae5013a090f8f0e9978019185ff5fa60954ce56ae0ddf37f22679cb2dd3ec243cb3a4b22 kubernetes-1.32.5.tar.gz +84d0951eff01ea1076a0add3b24014041b7fdd1717f39d0418e80d7b5dbbbd99ccf58c9b2269508b86e61b57b87e75b53107e5ed22e77000907ffbfdf93ab4f2 kubernetes-1.32.6.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 diff --git a/kubezero/kubezero/APKBUILD b/kubezero/kubezero/APKBUILD index 004dd99..9aa674b 100644 --- a/kubezero/kubezero/APKBUILD +++ b/kubezero/kubezero/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer pkgname=kubezero -pkgver=1.32.5 +pkgver=1.32.6 _containerd=2.1.2-r1337 _ecr=1.32.2 _iam=0.6.31 @@ -12,6 +12,7 @@ url="https://git.zero-downtime.net/ZeroDownTime/alpine-overlay/src/branch/master arch="x86_64" license="AGPL-3.0" makedepends="podman" +install="$pkgname.post-install" depends=" xz diff --git a/kubezero/kubezero/kubezero.post-install b/kubezero/kubezero/kubezero.post-install new file mode 100644 index 0000000..b253315 --- /dev/null +++ b/kubezero/kubezero/kubezero.post-install @@ -0,0 +1,18 @@ +#!/bin/sh + +# usage: add_once ... +add_once() { + local file="$1" + shift + for line; do + if ! grep -x -F "$line" "$file" 2>/dev/null; then + mkdir -p "${file%/*}" + printf "%s\n" "$line" >> "$file" + fi + done +} + +# Setup node for userns support +# 0-65K is host, 65K till 128K for rootless containerd services outside of k8s +add_once /etc/subuid "kubelet:131072:7274496" >/dev/null +add_once /etc/subgid "kubelet:131072:7274496" >/dev/null diff --git a/kubezero/zdt-base/APKBUILD b/kubezero/zdt-base/APKBUILD index 75113dd..73dcfbd 100644 --- a/kubezero/zdt-base/APKBUILD +++ b/kubezero/zdt-base/APKBUILD @@ -117,7 +117,7 @@ gcp() { } sha512sums=" -d163587077ba5a4485c81635e88a54bd45824878eddb66ebd1c4c6089a9f28d6cd73750c93504ed51297cbb279eb8cff38e0bbe5d4245c4209a1430317461d54 common.sh +e8a683b2ecb24676aa26571313c4656655abfaeaba5bc602cda8b48c859a50e71ac766e8abc07e98f97dcd40c8e739699724cc604e2db6716718e01138ed505f common.sh a14edaef7b95212e68a762d7549b96a1bebf0605ad33d2db3a96f56c9561f8a95c2dbb4b971b921bb5ab1fb9fc08803d3013b10bd1e16f546e5954cef94c6ba2 boot.sh eb7d5b6f92f500dbaba04a915cdd8d66e90456ca86bed86b3a9243f0c25577a9aa42c2ba28c3cad9dda6e6f2d14363411d78eff35656c7c60a6a8646f43dcba5 cloudbender-early.init cac71c605324ad8e60b72f54b8c39ee0924205fcd1f072af9df92b0e8216bcde887ffec677eb2f0eacce3df430f31d5b5609e997d85f14389ee099fbde3c478f cloudbender.init @@ -139,7 +139,7 @@ c955dabe692c0a4a2fa2b09ab9096f6b14e83064b34ae8d22697096daf6551f00b590d837787d66e 7da28446762a36a6737c5b30becbce78775bd943b4d0c5ef938a50f49b4f51f66708434aa79004c19d16c56c83f54c8d6d68e1502ebc250c73f8aae12bed83c0 get_iam_sshkeys.py ae1941fc45e61fa8d211f5ef7eff2dd01510a6d364c4302cab267812321a10e7434ecc8d8c9263d8671ce5604d04d6531601bf42886a55fb6aec7f321651e1dc uniq_hostname.py ee4264337d86ad99ba6cf9ec3017986c804ac208c0beb5fc8651345bd277bb6de03e7c3a8c1b751767647be48f9d45ac47a7d14cf040d9c827780984394e826d write_parameters.py -72b7120a5b7e928b6c351fa6b9fb9bc1697a61922d080d58e1aa5c6f680c54ce55de8375a5992cf66921b3a7be741ebc09746fcf41ab7de8d36c48922315701e zdt-profile.sh +5fa2d62cd802f2fff683f05b2ccfcf02f7bb2b3b40fc726e99dc30f639b3b85c8034732e1bf60c478ef60e3b0fbfbd58cc9adcf1fb80395f86d379853b43883a zdt-profile.sh 459f4957b10e6be8f9af04394f7bc1bd51364e629b687050607f7f4a8d60d92e90903ad7ef89ffed472f77506049ec7e163338a1b25ca6a65c6f1599cc13cfcf starship.toml a44a6d31635a63e35f466d122bccc1db174e7c57f87d6c388e93e6ad497e6366f3cb5774de21e9db20e3c2b6020c5594c0e5395b817e628d32cbdbfb30a61260 aws-certbot.sh " diff --git a/kubezero/zdt-base/common.sh b/kubezero/zdt-base/common.sh index b7f2927..20edb9f 100644 --- a/kubezero/zdt-base/common.sh +++ b/kubezero/zdt-base/common.sh @@ -225,7 +225,7 @@ retry() { add_swap() { [ -f /.swapfile ] || { dd if=/dev/zero of=/.swapfile bs=1M count=$1 && chmod 600 /.swapfile && mkswap /.swapfile && swapon /.swapfile; } grep -q "/.swapfile" /etc/fstab || echo "/.swapfile none swap sw 0 0" >> /etc/fstab - sysctl -w vm.swappiness=10 + # sysctl -w vm.swappiness=10 } # Get SSM secure string base64 decoded diff --git a/kubezero/zdt-base/xdg-runtime-dir-profile.sh b/kubezero/zdt-base/xdg-runtime-dir-profile.sh new file mode 100644 index 0000000..bf49682 --- /dev/null +++ b/kubezero/zdt-base/xdg-runtime-dir-profile.sh @@ -0,0 +1,8 @@ +# setup basic XDG_RUNTIME_DIR for things like rootless containerd +if test -z "${XDG_RUNTIME_DIR}"; then + export XDG_RUNTIME_DIR=/tmp/$(id -u)-runtime-dir + if ! test -d "${XDG_RUNTIME_DIR}"; then + mkdir "${XDG_RUNTIME_DIR}" + chmod 0700 "${XDG_RUNTIME_DIR}" + fi +fi diff --git a/kubezero/zdt-base/zdt-profile.sh b/kubezero/zdt-base/zdt-profile.sh index ad1de99..d22458b 100644 --- a/kubezero/zdt-base/zdt-profile.sh +++ b/kubezero/zdt-base/zdt-profile.sh @@ -8,4 +8,5 @@ alias monit_status='monit status -c /etc/monitrc.zdt' alias cu='doas cat /var/log/user-data.log' alias cl="doas cat /var/log/messages | jq -r '\"\(.time): \(.message)\"'" +alias ps_mem='procs -i VmRss --sortd VmRss' #alias tl="doas tail -f /var/log/messages | jq -r '\"\(.time): \(.message)\"'"