From 40298aff0245a30a6098bcaa76fccb943b5b324d Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 13 Jan 2025 22:09:03 +0000 Subject: [PATCH] feat: first working 1.31.4-alpha control plane --- kubezero/aws-iam-authenticator/APKBUILD | 4 +- kubezero/aws-neuron-driver/APKBUILD | 9 +- kubezero/containerd/APKBUILD | 8 +- kubezero/containerd/config.toml | 2 +- kubezero/cri-tools/APKBUILD | 4 +- kubezero/ecr-credential-provider/APKBUILD | 4 +- kubezero/kubernetes/APKBUILD | 167 +++++++--------------- kubezero/kubezero/APKBUILD | 13 +- kubezero/kubezero/containerd.conf | 2 +- 9 files changed, 76 insertions(+), 137 deletions(-) diff --git a/kubezero/aws-iam-authenticator/APKBUILD b/kubezero/aws-iam-authenticator/APKBUILD index 2f833ea..ca30ffd 100644 --- a/kubezero/aws-iam-authenticator/APKBUILD +++ b/kubezero/aws-iam-authenticator/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer pkgname=aws-iam-authenticator -pkgver=0.6.27 +pkgver=0.6.29 pkgrel=0 pkgdesc="AWS aws-iam-authenticator" url="https://github.com/kubernetes-sigs/aws-iam-authenticator" @@ -20,5 +20,5 @@ package() { } sha512sums=" -5940b02a4b8dd46a3ce0b2d5ed55bbe15ebcbd7431d53449986ce33501a38b71cf9db5ab7d5c6d4969b91b5d89d2a2bb5acc6648a9e552c100c58aba568c98ba aws-iam-authenticator-0.6.27.tar.gz +276efbbf44228b7ef6fe45e80c19443b134664d940706f2634e7478c4e8a3d2499bd0cbe70e1b7916af47dbc66ca1b5419f4738ad1f94ef82fe88f3a06f27d65 aws-iam-authenticator-0.6.29.tar.gz " diff --git a/kubezero/aws-neuron-driver/APKBUILD b/kubezero/aws-neuron-driver/APKBUILD index 113852b..920b8fd 100644 --- a/kubezero/aws-neuron-driver/APKBUILD +++ b/kubezero/aws-neuron-driver/APKBUILD @@ -5,7 +5,7 @@ # Todo: needs fix of https://github.com/aws-neuron/aws-neuron-sdk/issues/843 # pkgname=aws-neuron-driver -pkgver=2.18.12.0 +pkgver=2.19.64.0 pkgrel=0 pkgdesc="Linux Kernel module for AWS Neuron INF instances" url="https://awsdocs-neuron.readthedocs-hosted.com/en/latest/release-notes/index.html#" @@ -33,6 +33,11 @@ build() { unset CFLAGS CPPFLAGS CXXFLAGS unset LDFLAGS + # patch for recent gcc warning/errors, cause AWS cannot be bothered apparently + for f in neuron_dma.c neuron_sysfs_metrics.c v1/neuron_dhal_v1.c v2/neuron_dhal_v2.c; do + sed -i -e 's/const static/static const/' $f + done + make KERNEL_SRC_DIR=/lib/modules/$KERNEL_VERSION/build } @@ -47,5 +52,5 @@ package() { } sha512sums=" -fdabcd3acff8576e0edbb9cb20892c2ae2be96d84313e5576ee295672b7964ceb81cc512ff760820c903ee4eec831162bec17ebc8c4a32676b9c670c29dcdbeb aws-neuron-driver-2.18.12.0.deb +91e36a6cea7494d29d8c451fb79a73665290682b93baa293d76c9fb679ad94a5d6858ee49a7c939d4e408c93f4abdd9be6a31b9ff66de4a7d63ca18e25397ab2 aws-neuron-driver-2.19.64.0.deb " diff --git a/kubezero/containerd/APKBUILD b/kubezero/containerd/APKBUILD index d4320a3..8650e5e 100644 --- a/kubezero/containerd/APKBUILD +++ b/kubezero/containerd/APKBUILD @@ -4,8 +4,8 @@ pkgname=containerd # NOTE: containerd's Makefile tries to get REVISION from git, but we're building from a tarball. -_commit=57f17b0a6295a39009d861b89e3b3b87b005ca27 -pkgver=1.7.23 +_commit=88aa2f531d6c2922003cc7929e51daf1c14caa0a +pkgver=2.0.1 pkgrel=1337 pkgdesc="An open and reliable container runtime" url="https://containerd.io/" @@ -126,8 +126,8 @@ stress() { } sha512sums=" -4cb003a6ef2f9fe856665c3b7099e13b23cf07c77ed9a9ed50988d74de1933e3fe9463ae123635230f25cde38cd8a487133b11e20d829a79517c4d7fbe2ce012 containerd-1.7.23.tar.gz +7875eee0fb274545acb4d62f5bca808105580177db6007e59164fd57830ea3e8ab646b8e227027016bf8dd4816341d38a620bfef48bb0fd83de006b1a91826b7 containerd-2.0.1.tar.gz 75a882a95167578bb4f289822256e770ecf2f74d7a50181e622c15e847383120d3622100e5e5629b94b58e2082f990de1cc3daa2f69b0ee48827072c1e9dde0e containerd.confd 8315a8d58b4ba7e19ebed2cd82c7b5eaab45da630f9818a9e6cc8f3c8e88f159432474299798f79e6e465e843c91c0f50df04030083c8913c385ea1d73e81e6a containerd.initd -dfb92fffeac35310956da6c6ad5f8c43eba3a5355ecbfabeec0f9c7445a08e309312b56b6855a17a471fd6012cc099d6abb39dc8bd26279112d0fe936624023d config.toml +a10a1e1b5deea30c156a786592bfc54597bcf2d45c4e6447182b72a7d0a5e2eb058698a8830dbace95e71176aa3070d123bcf75c4c4a36d814182c5d24fe9d71 config.toml " diff --git a/kubezero/containerd/config.toml b/kubezero/containerd/config.toml index 99cf35e..1a94fdd 100644 --- a/kubezero/containerd/config.toml +++ b/kubezero/containerd/config.toml @@ -1,4 +1,4 @@ -version = 2 +version = 3 imports = ["/etc/containerd/conf.d/*.toml"] diff --git a/kubezero/cri-tools/APKBUILD b/kubezero/cri-tools/APKBUILD index ce5571a..1bad297 100644 --- a/kubezero/cri-tools/APKBUILD +++ b/kubezero/cri-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista # Maintainer: Francesco Colista pkgname=cri-tools -pkgver=1.30.1 +pkgver=1.31.1 pkgrel=0 pkgdesc="CLI tool for Kubelet Container Runtime Interface (CRI)" url="https://github.com/kubernetes-sigs/cri-tools" @@ -27,5 +27,5 @@ package() { } sha512sums=" -c3a989ec57016a05a83adbabab7ec49da267f0d6cfc603a4cb8cb4699fe499c16b49e910fb6bfda413a57f45eb3a3d6f0a5c5b8d76895695ed3870343a0c4db9 cri-tools-1.30.1.tar.gz +a72946944207d20f27236da12f7c2d532a1c9ebc881c3af4709494f7abc6f7b2d421934006a535a0b4a35926f09f58315ff0aaf4da870fd5a65281f547ef86a1 cri-tools-1.31.1.tar.gz " diff --git a/kubezero/ecr-credential-provider/APKBUILD b/kubezero/ecr-credential-provider/APKBUILD index edfa8cb..01d2b22 100644 --- a/kubezero/ecr-credential-provider/APKBUILD +++ b/kubezero/ecr-credential-provider/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer pkgname=ecr-credential-provider -pkgver=1.30.3 +pkgver=1.31.4 pkgrel=0 pkgdesc="AWS Kubernetes ecr-credential-provider" url="https://github.com/kubernetes/cloud-provider-aws" @@ -24,5 +24,5 @@ package() { } sha512sums=" -aa351cd531e452dd4ccead4a591a9161a25737ada93a7317c5c181c3d4fe55b279e94b686d8c03665ebee01191129a52b01c9dabfba7075c5e9bde52e6a341c8 ecr-credential-provider-1.30.3.tar.gz +d66898e34f2a0d4504ace6bb685897a360a315fd81371fbb2db727e65b4207cd728d07a3313f34985a0a1af26865fbbdde310aa88ee4af77d6ab02c354a6f223 ecr-credential-provider-1.31.4.tar.gz " diff --git a/kubezero/kubernetes/APKBUILD b/kubezero/kubernetes/APKBUILD index 24a5de3..52374c4 100644 --- a/kubezero/kubernetes/APKBUILD +++ b/kubezero/kubernetes/APKBUILD @@ -5,11 +5,11 @@ # Contributor: Dave # Maintainer: Stefan Reimer pkgname=kubernetes -pkgver=1.30.6 +pkgver=1.31.4 pkgrel=0 pkgdesc="Container Cluster Manager" url="https://kubernetes.io/" -arch="all !armhf !riscv64" +arch="all !armhf !loongarch64" license="Apache-2.0" options="!check chmod-clean net" # Tests hang @@ -22,23 +22,24 @@ makedepends="go go-bindata linux-headers rsync grep findutils bash $_kubeadm_deps " subpackages=" - kubeadm:_kubeadm - kubectl:_kubectl - kubelet:_kubelet - kubelet-openrc:_kubelet_openrc - kube-apiserver:_apiserver - kube-apiserver-openrc:_apiserver_openrc - kube-controller-manager:_controllermanager - kube-controller-manager-openrc:_controllermanager_openrc - kube-proxy:_proxy - kube-proxy-openrc:_proxy_openrc - kube-scheduler:_scheduler - kube-scheduler-openrc:_scheduler_openrc - kubeadm-bash-completion:_kubeadm_bash:noarch - kubectl-bash-completion:_kubectl_bash:noarch - kubeadm-zsh-completion:_kubeadm_zsh:noarch - kubectl-zsh-completion:_kubectl_zsh:noarch -" + kubeadm:_split + kubectl:_split + kubectl-convert:_split + kubelet:_split + kubelet-openrc + kube-apiserver:_split + kube-apiserver-openrc + kube-controller-manager:_split + kube-controller-manager-openrc + kube-proxy:_split + kube-proxy-openrc + kube-scheduler:_split + kube-scheduler-openrc + kubeadm-bash-completion + kubectl-bash-completion + kubeadm-zsh-completion + kubectl-zsh-completion + " source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes/kubernetes/archive/v$pkgver.tar.gz make-e2e_node-run-over-distro-bins.patch @@ -62,10 +63,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes/kubernetes/archiv kubelet.initd kubelet.confd - kubelet.logrotated" + kubelet.logrotated + " _agent="kubelet" -_cli="kubeadm kubectl" +_cli="kubeadm kubectl kubectl-convert" _services="kube-apiserver kube-controller-manager kube-proxy kube-scheduler" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" @@ -93,127 +95,58 @@ package() { mkdir -p "$pkgdir"/etc/kubernetes } -_do_subpkg() { - local _pkg=$1 +_split() { + local _pkg=$subpkgname pkgdesc="Kubernetes - $_pkg" case "$_pkg" in kubelet) depends="$_kubelet_deps" ;; kubeadm) depends="$_kubeadm_deps" ;; + kube-proxy) depends="$_kube_proxy_deps" ;; + kubectl-convert) depends="kubectl" ;; esac - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/$_pkg "$subpkgdir"/usr/bin - return 0 + case "$_pkg" in + kubelet|kube-proxy) install -d "$subpkgdir"/var/lib/$_pkg ;; + esac + + amove usr/bin/$_pkg + + if [ -f "$srcdir"/$_pkg.logrotated ]; then + install -d "$subpkgdir"/var/log/$_pkg + install -Dm644 "$srcdir"/$_pkg.logrotated "$subpkgdir"/etc/logrotate.d/$_pkg + fi } -_kubeadm() { _do_subpkg kubeadm; } -_kubectl() { _do_subpkg kubectl; } - -_kubeadm_bash() { _do_bashcomp kubeadm; } -_kubectl_bash() { _do_bashcomp kubectl; } - -_kubeadm_zsh() { _do_zshcomp kubeadm; } -_kubectl_zsh() { _do_zshcomp kubectl; } - -_kubelet() { - _do_subpkg kubelet - install -d "$subpkgdir"/var/lib/kubelet/conf.d - install -d "$subpkgdir"/var/log/kubelet - - install -Dm644 "$srcdir"/kubelet.logrotated "$subpkgdir"/etc/logrotate.d/kubelet -} - -_kubelet_openrc() { - pkgdesc="Kubernetes - kubelet (OpenRC init scripts)" +openrc() { + local name=${subpkgname%-openrc} + pkgdesc="Kubernetes - $name" + default_openrc depends="openrc" - install_if="openrc kubelet=$pkgver-r$pkgrel" - install -Dm755 "$srcdir"/kubelet.initd "$subpkgdir"/etc/init.d/kubelet - install -Dm644 "$srcdir"/kubelet.confd "$subpkgdir"/etc/conf.d/kubelet + install -Dm755 "$srcdir"/$name.initd "$subpkgdir"/etc/init.d/$name + install -Dm644 "$srcdir"/$name.confd "$subpkgdir"/etc/conf.d/$name } -_apiserver() { - _do_subpkg kube-apiserver - - install -d "$subpkgdir"/var/log/kube-apiserver - install -Dm644 "$srcdir"/kube-apiserver.logrotated "$subpkgdir"/etc/logrotate.d/kube-apiserver -} - -_apiserver_openrc() { - pkgdesc="Kubernetes - kube-apiserver (OpenRC init scripts)" - depends="openrc" - install_if="openrc kube-apiserver=$pkgver-r$pkgrel" - install -Dm755 "$srcdir"/kube-apiserver.initd "$subpkgdir"/etc/init.d/kube-apiserver - install -Dm644 "$srcdir"/kube-apiserver.confd "$subpkgdir"/etc/conf.d/kube-apiserver -} - -_controllermanager() { - _do_subpkg kube-controller-manager - - install -d "$subpkgdir"/var/log/kube-controller-manager - install -Dm644 "$srcdir"/kube-controller-manager.logrotated "$subpkgdir"/etc/logrotate.d/kube-controller-manager -} - -_controllermanager_openrc() { - pkgdesc="Kubernetes - kube-controller-manager (OpenRC init scripts)" - depends="openrc" - install_if="openrc kube-controller-manager=$pkgver-r$pkgrel" - - install -Dm755 "$srcdir"/kube-controller-manager.initd "$subpkgdir"/etc/init.d/kube-controller-manager - install -Dm644 "$srcdir"/kube-controller-manager.confd "$subpkgdir"/etc/conf.d/kube-controller-manager -} - -_proxy() { - _do_subpkg kube-proxy - depends="$_kube_proxy_deps" - - install -d "$subpkgdir"/var/lib/kube-proxy - install -d "$subpkgdir"/var/log/kube-proxy - install -Dm644 "$srcdir"/kube-proxy.logrotated "$subpkgdir"/etc/logrotate.d/kube-proxy -} - -_proxy_openrc() { - pkgdesc="Kubernetes - kube-proxy (OpenRC init scripts)" - depends="openrc" - install_if="openrc kube-proxy=$pkgver-r$pkgrel" - install -Dm755 "$srcdir"/kube-proxy.initd "$subpkgdir"/etc/init.d/kube-proxy - install -Dm644 "$srcdir"/kube-proxy.confd "$subpkgdir"/etc/conf.d/kube-proxy -} - -_scheduler() { - _do_subpkg kube-scheduler - install -d "$subpkgdir"/var/log/kube-scheduler - install -Dm644 "$srcdir"/kube-scheduler.logrotated "$subpkgdir"/etc/logrotate.d/kube-scheduler -} - -_scheduler_openrc() { - pkgdesc="Kubernetes - kube-scheduler (OpenRC init scripts)" - depends="openrc" - install_if="openrc kube-scheduler=$pkgver-r$pkgrel" - install -Dm755 "$srcdir"/kube-scheduler.initd "$subpkgdir"/etc/init.d/kube-scheduler - install -Dm644 "$srcdir"/kube-scheduler.confd "$subpkgdir"/etc/conf.d/kube-scheduler -} - -_do_bashcomp() { - local _pkgname=$1 +bashcomp() { + local _pkgname=${subpkgname%-bash-completion} pkgdesc="Bash completions for $_pkgname" install_if="$_pkgname=$pkgver-r$pkgrel bash-completion" mkdir -p "$subpkgdir"/usr/share/bash-completion/completions - "$builddir"/_output/local/bin/linux/*/$_pkgname completion bash>"$subpkgdir"/usr/share/bash-completion/completions/$_pkgname + "$builddir"/_output/local/go/bin/$_pkgname completion bash>"$subpkgdir"/usr/share/bash-completion/completions/$_pkgname } -_do_zshcomp() { - local _pkgname=$1 +zshcomp() { + local _pkgname=${subpkgname%-zsh-completion} pkgdesc="Zsh completions for $_pkgname" install_if="$_pkgname=$pkgver-r$pkgrel zsh" mkdir -p "$subpkgdir"/usr/share/zsh/site-functions - "$builddir"/_output/local/bin/linux/*/$_pkgname completion zsh \ + "$builddir"/_output/local/go/bin/$_pkgname completion zsh \ > "$subpkgdir"/usr/share/zsh/site-functions/_$_pkgname } sha512sums=" -c4b5ebb08dbd9daeac2f4da5a1b93c397473e7cf12439291ce80e43b4aae1d233c6e980a080b5c8aaa12e296aa04e068f8b00b23386b23802b99c2ce8f42c800 kubernetes-1.30.6.tar.gz +74e3b3a12f9b3322702f48b76b026fed5f2084181ab687acb109eff8b9f42a20067e173255b7ff4adb885525dff13a52d04055dae21b394275dd61c14040e0f6 kubernetes-1.31.4.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 737ba8f..c2330ca 100644 --- a/kubezero/kubezero/APKBUILD +++ b/kubezero/kubezero/APKBUILD @@ -1,9 +1,10 @@ # Contributor: Stefan Reimer # Maintainer: Stefan Reimer pkgname=kubezero -pkgver=1.30.6 -_containerd=1.7.23-r1337 -_ecr=1.30.3 +pkgver=1.31.4 +_containerd=2.0.1-r1337 +_ecr=1.31.4 +_iam=0.6.29 pkgrel=0 pkgdesc="KubeZero release package" @@ -22,7 +23,7 @@ depends=" kubelet~$pkgver kubectl~$pkgver ecr-credential-provider~$_ecr - aws-iam-authenticator~0.6.27 + aws-iam-authenticator~$_iam " options="!check" #install="$pkgname.post-install" @@ -32,7 +33,7 @@ subpackages=" " IMAGES=" - quay.io/cilium/cilium:v1.16.3 + quay.io/cilium/cilium:v1.16.5 ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.3 " @@ -93,6 +94,6 @@ ecb33fc3a0ffc378723624858002f9f5e180e851b55b98ab6611ecc6a73d4719bc7de240f87683fc fce1013f7b1bfa8ee526de62e642a37fda3168889723e873d3fb69e257f4caa1423b5a14b9343b12a87f3b6f93c7d3861b854efda67ef2d6a42a5ca8cf3d1593 evictLocalNode.sh 92499ec9a8b3634c42b16c01d27f1c1bb650bcc074a2c8d9d16cfe2ea08942948989c6aae79bd2df562ff17df11bbc329e0971f15c4e64f944457825dee7aa79 credential-provider.yaml 8b81eb0fb66e6a739965db6af6a31c443e8f612c06146bd51107372abd833b527423299ee11b27e011f46cfbee11415234b3fa0dea695dbbb06711e0ad58f08d kubelet.monit -001a34dcbfafb7f66c6b91d8de249a990d627f6dc5133a4e56e2cc357495dad333e03be408ee0d118ed99dba9d9a17d02165c336893b6bf51f689378ccc5de42 containerd.conf +d70366f629ea560174858e3746c66cbe31f1d11925fc8a608ff4d7306b795bfb1ed698a10b8422f2c3dda46f5e8a02ffe3cba2fc817ac8c877344778481b7836 containerd.conf b112ffd86f095aec47bf75179659af20720792c453d6cc9d11db26446aa2f3c237fe59b793dd8ef3ee93f6fd4230ff8abadfdada76e6452779b982a71eb37cb9 crictl.yaml " diff --git a/kubezero/kubezero/containerd.conf b/kubezero/kubezero/containerd.conf index 82fe9a8..4f6faa3 100644 --- a/kubezero/kubezero/containerd.conf +++ b/kubezero/kubezero/containerd.conf @@ -1,4 +1,4 @@ -version = 2 +version = 3 oom_score = -999