feat: various build fixes, latest aws-iam-authenticator

Makefile

@@ -4,10 +4,9 @@ REGION := us-east-1
 
 include .ci/podman.mk
 
-BUILDER := v3.16.2
+BUILDER := v3.16.3
 PKG := '*'
 CF_DIST := E1YFUJXMCXT2RN
-ARCH := ''
 
 BUILDER_RELEASE = $(shell echo $(BUILDER) | sed -e 's/-.*$$//')
 RELEASE := $(shell echo $(BUILDER_RELEASE) | sed -e 's/\.[0-9]$$//')
@@ -35,14 +34,14 @@ aports: reset-permissions
 	  cd aports && git checkout $(BUILDER_RELEASE); }
 
 apk: packages distfiles
-	podman run -it --rm \
+	podman run -it --rm --platform linux/$(_ARCH) \
 		-v ${PWD}/distfiles:/var/cache/distfiles \
 		-v ${PWD}/packages:/home/alpine/packages \
 		-v ${PWD}/aports:/home/alpine/aports \
 		-v ${PWD}/kubezero:/home/alpine/kubezero \
 		-v ${HOME}/.gitconfig/:/home/alpine/.gitconfig:ro \
 		-v ${HOME}/.abuild/:/home/alpine/.abuild:ro \
-		$(REGISTRY)/$(IMAGE):$(TAG) $(PKG) $(ARCH)
+		$(REGISTRY)/$(IMAGE):$(BUILDER) $(PKG)
 
 reset-permissions:
 	@[ -d aports ] && doas chown -R $(USER): aports

abuilder

@@ -1,7 +1,8 @@
 #!/bin/sh
-
 set -e
 
+[ -n "$DEBUG" ] && set -x
+
 if [ -d  ~/.abuild ]; then
   doas cp ~/.abuild/*.rsa.pub /etc/apk/keys/
 fi
@@ -12,15 +13,13 @@ done
 
 doas apk update
 
-if [ "$1" == 'debug' ]; then
-  sh
 
-elif [ "$1" == 'aarch64-toolchain' ]; then
+if [ "$1" = 'aarch64-toolchain' ]; then
   aarch64-toolchain.sh
 
 else
   # Set ENV for cross compile for aarch64
-  if [ "$2" == "aarch64" ]; then
+  if [ "$2" = "cross-arm64" ]; then
     ALPINE="v3.16"
     TARGET_ARCH=aarch64
     SUDO_APK=abuild-apk
@@ -55,7 +54,7 @@ else
     else
       APKBUILD=$pkg abuild checksum
       echo "Please update your APKBUILD with the following checksums after verification:"
-      . $pkg/APKBUILD && echo $sha512sums
+      . $pkg && echo $sha512sums
     fi
   done
 fi

kubezero/aws-iam-authenticator/APKBUILD

@@ -1,7 +1,7 @@
 # Contributor: Stefan Reimer <stefan@zero-downtime.net>
 # Maintainer: Stefan Reimer <stefan@zero-downtime.net>
 pkgname=aws-iam-authenticator
-pkgver=0.5.9
+pkgver=0.5.11
 pkgrel=0
 pkgdesc="AWS aws-iam-authenticator"
 url="https://github.com/kubernetes-sigs/aws-iam-authenticator"
@@ -20,5 +20,5 @@ package() {
 }
 
 sha512sums="
-1e1750f2734faea5cae612debb8777891247f59c51ad98e4c466bc20925950b1b04dc407458cfb0db9c3d961d1d9d07639523619399c5037211e8e6f64794fca  aws-iam-authenticator-0.5.9.tar.gz
+bf3ea959c81fa1b94463f2bd892010697b43fddb825a55c9fd62f418fccde2df804490010ec91c050c7ad01307508e220200c9705157a656a8ae79122c4fe9e8  aws-iam-authenticator-0.5.11.tar.gz
 "

kubezero/kubernetes/APKBUILD

@@ -1,10 +1,11 @@
+# Contributor: Stefan Reimer <stefan@zero-downtime.net>
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Contributor: Mateusz Mikuła <matti@marinelayer.io>
 # Contributor: Tiago Ilieve <tiago.myhro@gmail.com>
 # Contributor: Dave <dj.2dixx@gmail.com>
-# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
+# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
 pkgname=kubernetes
-pkgver=1.23.11
+pkgver=1.24.7
 pkgrel=0
 pkgdesc="Container Cluster Manager"
 url="https://kubernetes.io/"
@@ -202,8 +203,8 @@ _do_zshcomp() {
 		> "$subpkgdir"/usr/share/zsh/site-functions/_$_pkgname
 }
 
-sha512sums='
+sha512sums="
-160da70eca160875f348e54852bcbf248a5308c4f547b4d0c19d714618b329ee998cb7dda5aac396ece9f4d11d21c74b0cd781de96572193481a3183bd393de2  kubernetes-1.23.11.tar.gz
+35612859f7b62c027b6edfb6f91ab81af97c711cf0648dbd6bf69665b7c480fa9c0b3f012709401b1a78fef761cee4455a4172f8545b33147911140943636446  kubernetes-1.24.7.tar.gz
 c350bb0a63ada0cc3657fe07598101775243083aa1eabda898080b7b01b129e6fdd7ad1a61950cc039b73b081f38de3b856baedf5c075f39916be1547b11d184  make-e2e_node-run-over-distro-bins.patch
 56201491d2dfe3a487931cbf5c6e60af898701b9541a936d80e3823948fcfb98508e3d51f4aaa415ce971f7bd20a7b51f74f025c76b83f58d5a8de8ce0ab679b  make-test-cmd-run-over-hyperkube-based-kubectl.patch
 e690daff2adb1013c92124f32e71f8ed9a18c611ae6ae5fcb5ce9674768dbf9d911a05d7e4028488cda886e63b82e8ac0606d14389a05844c1b5538a33dd09d1  kube-apiserver.initd
@@ -219,6 +220,6 @@ d7e022ee22da191bda7382f87cb293d9c9d115a3df0c2054bf918279eb866f99c6d5c21e4c98eae8
 af88b382ab75657d0ff13c3f8f6d924cef9f2df7807a9a27daa63495981801bc4b607998f65c0758c11a7e070e43c24f7184ba7720711109c74b1c4d57919e34  kube-scheduler.confd
 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6  kube-scheduler.logrotated
 70fb5c95a02083025f38b099fa50d1a1e8893bc4141955031c4129c0d4aa20fde05c565c3f2e5b6ea31efb954673aeb8289f22eadcedeb7cb89e197898dfc65d  kubelet.initd
-ce7d2b5bff5ac6af45f413b4dc2dd62c7bfa9a0b06ab348730da85ceb851ed0d09763215889d3f867ce2250a599ee0113a9bee018068a740500ab10616dd7610  kubelet.confd
+f79ea6dec632ca052f8cd061bf0c5f7f821c7013c048b4737752e1a41c677c020c1f9454ddabe7f9ba5d55c2a8a4718170e30049b7212a4a2dc91148a3ac7ebc  kubelet.confd
-603277e6bc73bd0463520c158a5ed03390bcb4874fd193529ad087409e2ea894c5856acf583d62a0dd3430d7e6938db28d1b3439c60c427c1c84db1dd81bfbff  kubelet.logrotated
+941f4a7579dcf78da2d323ac69195e95eba6600e6fcefe9231447f11c9867a7aa57b4189ee1fefb10eab19c89665ea2e7696b539c92e99fbcde905d2ff85be58  kubelet.logrotated
-'
+"

kubezero/kubernetes/kubelet.confd

@@ -1 +1 @@
-command_args="--cni-bin-dir=/usr/libexec/cni --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --cgroup-driver=cgroupfs --config=/var/lib/kubelet/config.yaml"
+command_args="--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --cgroup-driver=cgroupfs --config=/var/lib/kubelet/config.yaml"

kubezero/kubernetes/kubelet.logrotated

@@ -1,8 +1,8 @@
 /var/log/kubelet/*.log {
 	nodateext
 	missingok
-	size 10M
+	size 32M
-	rotate 3
+	rotate 2
 	compress
 	copytruncate
 }