Kubernetes 1.31.6

15e4d1f ci: make work with main branch

git-subtree-dir: .ci
git-subtree-split: 15e4d1f589c8e055944b2a4b58a9a50728e245b4

.ci/README.md

@@ -14,7 +14,7 @@ include .ci/podman.mk
 
 Add subtree to your project:
 ```
-git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash
+git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git main --squash
 ```
 
 

Makefile

@@ -2,6 +2,8 @@ REGISTRY := public.ecr.aws/zero-downtime
 IMAGE := alpine-builder
 REGION := us-east-1
 
+# NEW_TAG = $(shell podman image inspect alpine:3.21 --format='{{ index .Annotations "org.opencontainers.image.version" }}')
+
 # Also tag builder images as latest major version
 EXTRA_TAGS = $(shell echo $(GIT_TAG) | awk -F '.' '{ print $$1 "." $$2 }')
 
@@ -22,7 +24,7 @@ aarch64-toolchain:
 		-v ${PWD}/aports:/home/alpine/aports \
 		-v ${HOME}/.gitconfig/:/home/alpine/.gitconfig:ro \
 		-v ${HOME}/.abuild/:/home/alpine/.abuild:ro \
-		$(REGISTRY)/$(IMAGE):$(TAG) aarch64-toolchain
+		$(REGISTRY)/$(IMAGE):v$(ALPINE_MAJOR) aarch64-toolchain
 
 packages:
 	mkdir -p packages/kubezero/aarch64 packages/kubezero/x86_64

kubezero/aws-iam-authenticator/APKBUILD

@@ -9,7 +9,17 @@ arch="x86_64 aarch64 armv7 x86"
 license="Apache-2.0"
 makedepends="go bash"
 options="!check chmod-clean net"
-source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes-sigs/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes-sigs/$pkgname/archive/refs/tags/v$pkgver.tar.gz
+        aws-iam-authenticator.initd
+        aws-iam-authenticator.monit
+        config.yaml
+        "
+
+install="$pkgname-server.pre-install"
+subpackages="$pkgname-server"
+
+pkggroups="awsiam"
+pkgusers="awsiam"
 
 build() {
   make bin
@@ -19,6 +29,19 @@ package() {
 	install -Dm755 "$builddir/_output/bin/aws-iam-authenticator" "$pkgdir"/usr/bin/aws-iam-authenticator
 }
 
+server() {
+	install -d "$subpkgdir"/var/log/"$pkgname" -g awsiam -m 775
+	install -d "$subpkgdir"/etc/"$pkgname" -g awsiam -m 775
+
+  install "$srcdir"/config.yaml "$subpkgdir"/etc/$pkgname/config.yaml
+  install -Dm755 "$srcdir"/$pkgname.initd "$subpkgdir"/etc/init.d/$pkgname
+
+  install -Dm644 "$srcdir"/$pkgname.monit "$subpkgdir/etc/monit.d/$pkgname.conf"
+}
+
 sha512sums="
 276efbbf44228b7ef6fe45e80c19443b134664d940706f2634e7478c4e8a3d2499bd0cbe70e1b7916af47dbc66ca1b5419f4738ad1f94ef82fe88f3a06f27d65  aws-iam-authenticator-0.6.29.tar.gz
+a374448ffe7ac2079fef4a4d370b8d4b3aa10d371fff976e41a1107c17198d366f0e28f47f7313555503eaa44d358dff385f84a0000709aa6b75991a0c35f77b  aws-iam-authenticator.initd
+81454a32d898214c80fef1dda1630e6f6550180908e0b45980b25700478ee7fa4a8ef797cf0f1597fa98713b84f2ae9bd324d017e636ef965c26876147039745  aws-iam-authenticator.monit
+97fb2b255161837b1789c17dc7543644d24404ee9eeb95ace0d7c1d8ba12647cca78a8d86ff07dcb7a3eb833d9bc632b4f8511df8aedf484d61acc48929ce9be  config.yaml
 "

kubezero/aws-iam-authenticator/aws-iam-authenticator-server.pre-install

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S awsiam 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G awsiam -g awsiam awsiam 2>/dev/null
+
+exit 0

kubezero/aws-iam-authenticator/aws-iam-authenticator.initd

@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+
+name=aws-iam-authenticator
+command="/usr/bin/aws-iam-authenticator"
+command_background="true"
+command_user="awsiam:awsiam"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
+
+start_stop_daemon_args="--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+                        --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+command_args="server -l=json --config=/etc/aws-iam-authenticator/config.yaml"
+
+depend() {
+	need net
+}

kubezero/aws-iam-authenticator/aws-iam-authenticator.monit

@@ -0,0 +1,10 @@
+check process aws-iam-authenticator pidfile /run/aws-iam-authenticator.pid
+  start program = "/sbin/rc-service aws-iam-authenticator start"
+  stop program  = "/sbin/rc-service aws-iam-authenticator stop"
+  restart program = "/sbin/rc-service aws-iam-authenticator restart"
+  if failed
+    port 21363
+    protocol http
+    request "/healthz"
+    for 2 cycles
+  then restart

kubezero/aws-iam-authenticator/config.yaml

@@ -0,0 +1 @@
+clusterID: exampleCluster

kubezero/kubernetes/APKBUILD

@@ -5,7 +5,7 @@
 # Contributor: Dave <dj.2dixx@gmail.com>
 # Maintainer: Stefan Reimer <stefan@zero-downtime.net>
 pkgname=kubernetes
-pkgver=1.31.5
+pkgver=1.31.6
 pkgrel=0
 pkgdesc="Container Cluster Manager"
 url="https://kubernetes.io/"
@@ -146,7 +146,7 @@ zshcomp() {
 }
 
 sha512sums="
-6c773d706cb45bf0d8cb18cbd718ab2053fd4d17ae4db35b9159b258b55dbef71d0f6fd6e6057d8b5e027bdfc9ffb7a0a4d2bc63d8f092c48f5b44f3cc73ff96  kubernetes-1.31.5.tar.gz
+cc27eedde442c185d9b08bbe25b1d7f189d93d0519b4d02ab47a711dc6345ac3c942cc82ede4026bd20fdabef71f8615df63d06ebd550c60acba6a595c4574b7  kubernetes-1.31.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

kubezero/kubezero/APKBUILD

@@ -1,8 +1,8 @@
 # Contributor: Stefan Reimer <stefan@zero-downtime.net>
 # Maintainer: Stefan Reimer <stefan@zero-downtime.net>
 pkgname=kubezero
-pkgver=1.31.5
+pkgver=1.31.6
-_containerd=2.0.0-r1337
+_containerd=1.7.25-r1337
 _ecr=1.31.4
 _iam=0.6.29
 
@@ -94,6 +94,6 @@ ecb33fc3a0ffc378723624858002f9f5e180e851b55b98ab6611ecc6a73d4719bc7de240f87683fc
 fce1013f7b1bfa8ee526de62e642a37fda3168889723e873d3fb69e257f4caa1423b5a14b9343b12a87f3b6f93c7d3861b854efda67ef2d6a42a5ca8cf3d1593  evictLocalNode.sh
 92499ec9a8b3634c42b16c01d27f1c1bb650bcc074a2c8d9d16cfe2ea08942948989c6aae79bd2df562ff17df11bbc329e0971f15c4e64f944457825dee7aa79  credential-provider.yaml
 8b81eb0fb66e6a739965db6af6a31c443e8f612c06146bd51107372abd833b527423299ee11b27e011f46cfbee11415234b3fa0dea695dbbb06711e0ad58f08d  kubelet.monit
-dad818ca88a6b3404b155f145522ac07217f6812bdd3282f850ee84fdd94f602c857b62bb769a3e0273991b29a2cb9e8f57e005233c31a4171642b637e270f6c  containerd.conf
+2814ac38da801582b4865f79edd775eb14e35ea3789038881cec7f7ae585bbe9edd8cd30b9525c4324bf7b594123f00b6b34b2508434db220ba08f368581fdcc  containerd.conf
 b112ffd86f095aec47bf75179659af20720792c453d6cc9d11db26446aa2f3c237fe59b793dd8ef3ee93f6fd4230ff8abadfdada76e6452779b982a71eb37cb9  crictl.yaml
 "

kubezero/multus-cni/APKBUILD

@@ -11,9 +11,6 @@ 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"