From b63da6235de8b421a2e712519badb24c51970200 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 13 Apr 2022 19:07:07 +0200 Subject: [PATCH] feat: Kubernetes 1.22 --- Makefile | 4 +- v3.15/cri-o/APKBUILD | 96 +++++++++++++++++ v3.15/cri-o/cni-plugins-path.patch | 23 +++++ v3.15/cri-o/crio.conf | 5 + v3.15/cri-o/crio.initd | 35 +++++++ v3.15/cri-o/crio.logrotated | 7 ++ v3.15/cri-o/fix-test.patch | 44 ++++++++ v3.15/cri-o/makefile-fix-install.patch | 138 +++++++++++++++++++++++++ v3.15/cri-o/remove-systemd-files.patch | 13 +++ v3.15/cri-tools/APKBUILD | 6 +- v3.15/kubernetes/APKBUILD | 22 +++- v3.15/kubernetes/kubelet.confd | 2 +- 12 files changed, 387 insertions(+), 8 deletions(-) create mode 100644 v3.15/cri-o/APKBUILD create mode 100644 v3.15/cri-o/cni-plugins-path.patch create mode 100644 v3.15/cri-o/crio.conf create mode 100755 v3.15/cri-o/crio.initd create mode 100644 v3.15/cri-o/crio.logrotated create mode 100644 v3.15/cri-o/fix-test.patch create mode 100644 v3.15/cri-o/makefile-fix-install.patch create mode 100644 v3.15/cri-o/remove-systemd-files.patch diff --git a/Makefile b/Makefile index 365fae7..7b56c1f 100644 --- a/Makefile +++ b/Makefile @@ -21,14 +21,16 @@ aports_update: aports # Mounts release into /work of the builder container to build all build: packages distfiles aports_update work + mkdir -p /tmp/_alpine-work podman run -ti --rm \ -v ${PWD}/distfiles:/var/cache/distfiles \ -v ${PWD}/packages:/home/alpine/packages \ - -v ${PWD}/work/:/home/alpine/work \ + -v /tmp/_alpine-work:/home/alpine/work \ -v ${PWD}/$(RELEASE)/:/home/alpine/src:ro \ -v ${HOME}/.gitconfig/:/home/alpine/.gitconfig:ro \ -v ${HOME}/.abuild/:/home/alpine/.abuild:ro \ public.ecr.aws/zero-downtime/alpine-builder:${BUILDER} $(PKG) + doas rm -rf /tmp/_alpine-work upload: aws s3 cp --recursive packages/work/x86_64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --exclude APKINDEX.tar.gz diff --git a/v3.15/cri-o/APKBUILD b/v3.15/cri-o/APKBUILD new file mode 100644 index 0000000..6030a27 --- /dev/null +++ b/v3.15/cri-o/APKBUILD @@ -0,0 +1,96 @@ +# Contributor: ungleich +# Contributor: Francesco Colista +# Contributor: TBK +# Maintainer: ungleich +pkgname=cri-o +pkgver=1.22.3 +pkgrel=0 +pkgdesc="OCI-based implementation of Kubernetes Container Runtime Interface" +url="https://github.com/cri-o/cri-o/" +# mips(64): build errors with dependencies +arch="all !mips !mips64" +license="Apache-2.0" + # Most tests will fail if not ran as root + # since it tries to create network interfaces +options="net chmod-clean !check" +depends=" + cni-plugins + conmon + conntrack-tools + containers-common + iproute2 + iptables + runc + " +makedepends=" + bash + btrfs-progs-dev + eudev-dev + glib-dev + go + go-md2man + gpgme-dev + libseccomp-dev + libselinux-dev + lvm2-dev + ostree-dev + tzdata + " +checkdepends="bats cri-tools jq parallel sudo" +subpackages=" + $pkgname-doc + $pkgname-bash-completion + $pkgname-zsh-completion + $pkgname-fish-completion + $pkgname-contrib-cni:contrib_cni:noarch + $pkgname-openrc + " +source="https://github.com/cri-o/cri-o/archive/v$pkgver/cri-o-$pkgver.tar.gz + crio.conf + crio.initd + crio.logrotated + cni-plugins-path.patch + makefile-fix-install.patch + fix-test.patch + remove-systemd-files.patch + " + +build() { + export GOPATH="$srcdir" + export GOBIN="$GOPATH/bin" + # https://github.com/cri-o/cri-o/blob/master/install.md#build-tags + make BUILDTAGS="seccomp selinux containers_image_openpgp containers_image_ostree_stub" +} + +check() { + make localintegration +} + +package() { + make DESTDIR="$pkgdir" PREFIX=/usr CRICTL_CONFIG_DIR="/etc/crio" OCIUMOUNTINSTALLDIR="/etc/crio" install + + # We want it in etc so apk does not overwrite it + mkdir -p "$pkgdir"/usr/share/oci-umount/oci-umount.d/ + ln -sf /etc/crio/crio-umount.conf "$pkgdir"/usr/share/oci-umount/oci-umount.d/crio-umount.conf + + install -Dm755 "$srcdir"/crio.initd "$pkgdir"/etc/init.d/crio + install -Dm644 "$srcdir"/crio.conf "$pkgdir"/etc/crio/crio.conf + install -Dm644 "$srcdir"/crio.logrotated "$pkgdir"/etc/logrotate.d/crio +} + +contrib_cni() { + pkgdesc="$pkgname contrib cni config files" + mkdir -p "$subpkgdir"/etc/cni/net.d + cp "$builddir"/contrib/cni/*.conf "$subpkgdir"/etc/cni/net.d +} + +sha512sums=" +9054739355e919804ef13516d4a051dfbec458cb65ab1fe87f04c0c92e34d9476d36e4823de663217af8eb11deb538eaca9eebb655fb97a9f3ecb79581d8bdcc cri-o-1.22.3.tar.gz +e026f056ed92489413e16ed7955a9dcd7d1f4df1cc28e3ea785771b44d43811fea4f5b953cc46bc0c4aeac8ad07115bfff304d7516ebd24f2e58fe782ff812c8 crio.conf +29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9 crio.initd +1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516 crio.logrotated +0a567dfa431ab1e53f2a351689be8d588a60cc5fcdbda403ec4f8b6ab9b1c18ad425f6c47f9a5ab1491e3a61a269dc4efa6a59e91e7521fa2b6bb165074aa8e0 cni-plugins-path.patch +f9577aa7b1c90c6809010e9e406e65092251b6e82f6a0adbc3633290aa35f2a21895e1a8b6ba4b6375dcad3e02629b49a34ab16387e1c36eeb32c8f4dac74706 makefile-fix-install.patch +26ed10b478feb19cb11f5916b24301943f9e316fdd62d53ec310bb05ffcf4213ceece1340d2486461557abb04074e85002b11b6347fddaaa45ad7439e907a5a7 fix-test.patch +78c150f87027de489289596371dce0465159ced0758776b445deb58990e099de9c654406183c9da3cc909878b24d28db62121b7056cd180a6f2820e79e165cc6 remove-systemd-files.patch +" diff --git a/v3.15/cri-o/cni-plugins-path.patch b/v3.15/cri-o/cni-plugins-path.patch new file mode 100644 index 0000000..5a76edb --- /dev/null +++ b/v3.15/cri-o/cni-plugins-path.patch @@ -0,0 +1,23 @@ +Alpine's cni-plugins are installs at /usr/libexec/cni/ + +--- a/docs/crio.conf.5.md ++++ b/docs/crio.conf.5.md +@@ -301,7 +301,7 @@ + **network_dir**="/etc/cni/net.d/" + Path to the directory where CNI configuration files are located. + +-**plugin_dirs**=["/opt/cni/bin/",] ++**plugin_dirs**=["/usr/libexec/cni/",] + List of paths to directories where CNI plugin binaries are located. + + ## CRIO.METRICS TABLE +--- a/pkg/config/config_unix.go ++++ b/pkg/config/config_unix.go +@@ -5,7 +5,7 @@ + // Defaults for linux/unix if none are specified + const ( + cniConfigDir = "/etc/cni/net.d/" +- cniBinDir = "/opt/cni/bin/" ++ cniBinDir = "/usr/libexec/cni/" + containerExitsDir = "/var/run/crio/exits" + ContainerAttachSocketDir = "/var/run/crio" diff --git a/v3.15/cri-o/crio.conf b/v3.15/cri-o/crio.conf new file mode 100644 index 0000000..70dc756 --- /dev/null +++ b/v3.15/cri-o/crio.conf @@ -0,0 +1,5 @@ +[crio.runtime] + +# Overide defaults to not use systemd cgroups. +conmon_cgroup = "pod" +cgroup_manager = "cgroupfs" diff --git a/v3.15/cri-o/crio.initd b/v3.15/cri-o/crio.initd new file mode 100755 index 0000000..9e6383a --- /dev/null +++ b/v3.15/cri-o/crio.initd @@ -0,0 +1,35 @@ +#!/sbin/openrc-run +# Copyright 2015-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="OCI Kubernetes Container Runtime daemon" +pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} +extra_started_commands="reload" +command="/usr/bin/${RC_SVCNAME}" +command_args="${command_args}" +command_background="true" +start_stop_daemon_args=" \ + --stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \ + --stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log" + +depend() { + need net +} + +checkconfig() { + checkpath --directory --owner root:root --mode 0775 \ + /var/log/${RC_SVCNAME} + checkpath --file --owner root:root --mode 0644 \ + /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log +} + +start() { + checkconfig + default_start +} + +reload() { + ebegin "Reloading ${RC_SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} diff --git a/v3.15/cri-o/crio.logrotated b/v3.15/cri-o/crio.logrotated new file mode 100644 index 0000000..fb0b8b1 --- /dev/null +++ b/v3.15/cri-o/crio.logrotated @@ -0,0 +1,7 @@ +/var/log/crio/crio.log { + missingok + size 5M + rotate 3 + compress + copytruncate +} diff --git a/v3.15/cri-o/fix-test.patch b/v3.15/cri-o/fix-test.patch new file mode 100644 index 0000000..a5b47b0 --- /dev/null +++ b/v3.15/cri-o/fix-test.patch @@ -0,0 +1,44 @@ +--- a/test/helpers.bash ++++ b/test/helpers.bash +@@ -68,7 +68,7 @@ + # The default log directory where all logs will go unless directly specified by the kubelet + DEFAULT_LOG_PATH=${DEFAULT_LOG_PATH:-/var/log/crio/pods} + # Cgroup manager to be used +-CONTAINER_CGROUP_MANAGER=${CONTAINER_CGROUP_MANAGER:-systemd} ++CONTAINER_CGROUP_MANAGER=${CONTAINER_CGROUP_MANAGER:-cgroupfs} + # Image volumes handling + CONTAINER_IMAGE_VOLUMES=${CONTAINER_IMAGE_VOLUMES:-mkdir} + # Container pids limit +@@ -166,7 +166,7 @@ + # Copy all the CNI dependencies around to ensure encapsulated tests + CRIO_CNI_PLUGIN="$TESTDIR/cni-bin" + mkdir "$CRIO_CNI_PLUGIN" +- cp /opt/cni/bin/* "$CRIO_CNI_PLUGIN" ++ cp /usr/libexec/cni/* "$CRIO_CNI_PLUGIN" + cp "$INTEGRATION_ROOT"/cni_plugin_helper.bash "$CRIO_CNI_PLUGIN" + sed -i "s;%TEST_DIR%;$TESTDIR;" "$CRIO_CNI_PLUGIN"/cni_plugin_helper.bash + +--- a/test/cni_plugin_helper.bash ++++ b/test/cni_plugin_helper.bash +@@ -43,7 +43,7 @@ + . "$TEST_DIR"/cni_plugin_helper_input.env + rm -f "$TEST_DIR"/cni_plugin_helper_input.env + +-result=$(/opt/cni/bin/bridge "$@") || exit $? ++result=$(/usr/libexec/cni/bridge "$@") || exit $? + + if [[ "${DEBUG_ARGS}" == "malformed-result" ]]; then + cat <<-EOF +--- a/test/cgroups.bats ++++ b/test/cgroups.bats +@@ -26,6 +26,10 @@ + } + + @test "conmon custom cgroup" { ++ if [[ "$CONTAINER_CGROUP_MANAGER" != "systemd" ]]; then ++ skip "need systemd cgroup manager" ++ fi ++ + CONTAINER_CGROUP_MANAGER="systemd" CONTAINER_DROP_INFRA_CTR=false CONTAINER_MANAGE_NS_LIFECYCLE=false CONTAINER_CONMON_CGROUP="customcrioconmon.slice" start_crio + + jq ' .linux.cgroup_parent = "Burstablecriotest123.slice"' \ diff --git a/v3.15/cri-o/makefile-fix-install.patch b/v3.15/cri-o/makefile-fix-install.patch new file mode 100644 index 0000000..8b44339 --- /dev/null +++ b/v3.15/cri-o/makefile-fix-install.patch @@ -0,0 +1,138 @@ +--- a/Makefile ++++ b/Makefile +@@ -9,11 +9,11 @@ + + PROJECT := github.com/cri-o/cri-o + CRIO_INSTANCE := crio_dev +-PREFIX ?= ${DESTDIR}/usr/local ++PREFIX ?= /usr/local + BINDIR ?= ${PREFIX}/bin + LIBEXECDIR ?= ${PREFIX}/libexec + MANDIR ?= ${PREFIX}/share/man +-ETCDIR ?= ${DESTDIR}/etc ++ETCDIR ?= /etc + ETCDIR_CRIO ?= ${ETCDIR}/crio + DATAROOTDIR ?= ${PREFIX}/share/containers + BUILDTAGS ?= containers_image_ostree_stub \ +@@ -26,7 +26,7 @@ + $(shell hack/seccomp_tag.sh) \ + $(shell hack/selinux_tag.sh) \ + $(shell hack/libsubid_tag.sh) +-CRICTL_CONFIG_DIR=${DESTDIR}/etc ++CRICTL_CONFIG_DIR = /etc + CONTAINER_RUNTIME ?= podman + BUILD_PATH := $(shell pwd)/build + BUILD_BIN_PATH := ${BUILD_PATH}/bin +@@ -420,68 +420,70 @@ + install: .gopathok install.bin install.man install.completions install.systemd install.config + + install.bin-nobuild: +- install ${SELINUXOPT} -D -m 755 bin/crio $(BINDIR)/crio +- install ${SELINUXOPT} -D -m 755 bin/crio-status $(BINDIR)/crio-status +- install ${SELINUXOPT} -D -m 755 bin/pinns $(BINDIR)/pinns ++ install ${SELINUXOPT} -D -m 755 bin/crio ${DESTDIR}$(BINDIR)/crio ++ install ${SELINUXOPT} -D -m 755 bin/crio-status ${DESTDIR}$(BINDIR)/crio-status ++ install ${SELINUXOPT} -D -m 755 bin/pinns ${DESTDIR}$(BINDIR)/pinns + + install.bin: binaries install.bin-nobuild + + install.man-nobuild: +- install ${SELINUXOPT} -d -m 755 $(MANDIR)/man5 +- install ${SELINUXOPT} -d -m 755 $(MANDIR)/man8 +- install ${SELINUXOPT} -m 644 $(filter %.5,$(MANPAGES)) -t $(MANDIR)/man5 +- install ${SELINUXOPT} -m 644 $(filter %.8,$(MANPAGES)) -t $(MANDIR)/man8 ++ install ${SELINUXOPT} -d -m 755 ${DESTDIR}$(MANDIR)/man5 ++ install ${SELINUXOPT} -d -m 755 ${DESTDIR}$(MANDIR)/man8 ++ install ${SELINUXOPT} -m 644 $(filter %.5,$(MANPAGES)) -t ${DESTDIR}$(MANDIR)/man5 ++ install ${SELINUXOPT} -m 644 $(filter %.8,$(MANPAGES)) -t ${DESTDIR}$(MANDIR)/man8 + + install.man: $(MANPAGES) install.man-nobuild + + install.config-nobuild: +- install ${SELINUXOPT} -d $(DATAROOTDIR)/oci/hooks.d +- install ${SELINUXOPT} -d $(ETCDIR_CRIO)/crio.conf.d +- install ${SELINUXOPT} -D -m 644 crio.conf $(ETCDIR_CRIO)/crio.conf +- install ${SELINUXOPT} -D -m 644 crio-umount.conf $(OCIUMOUNTINSTALLDIR)/crio-umount.conf +- install ${SELINUXOPT} -D -m 644 crictl.yaml $(CRICTL_CONFIG_DIR) ++ install ${SELINUXOPT} -d ${DESTDIR}$(ETCDIR_CRIO)/crio.conf.d ++ install ${SELINUXOPT} -d ${DESTDIR}$(ETCDIR)/containers/oci/hooks.d ++ install ${SELINUXOPT} -d ${DESTDIR}$(DATAROOTDIR)/oci/hooks.d ++ install ${SELINUXOPT} -D -m 644 crio.conf ${DESTDIR}$(ETCDIR_CRIO)/crio.conf ++ install ${SELINUXOPT} -D -m 644 crio-umount.conf ${DESTDIR}$(OCIUMOUNTINSTALLDIR)/crio-umount.conf ++ install ${SELINUXOPT} -D -m 644 crictl.yaml ${DESTDIR}$(CRICTL_CONFIG_DIR) + + install.config: crio.conf install.config-nobuild + + install.completions: +- install ${SELINUXOPT} -d -m 755 ${BASHINSTALLDIR} +- install ${SELINUXOPT} -d -m 755 ${FISHINSTALLDIR} +- install ${SELINUXOPT} -d -m 755 ${ZSHINSTALLDIR} +- install ${SELINUXOPT} -D -m 644 -t ${BASHINSTALLDIR} completions/bash/crio +- install ${SELINUXOPT} -D -m 644 -t ${FISHINSTALLDIR} completions/fish/crio.fish +- install ${SELINUXOPT} -D -m 644 -t ${ZSHINSTALLDIR} completions/zsh/_crio +- install ${SELINUXOPT} -D -m 644 -t ${BASHINSTALLDIR} completions/bash/crio-status +- install ${SELINUXOPT} -D -m 644 -t ${FISHINSTALLDIR} completions/fish/crio-status.fish +- install ${SELINUXOPT} -D -m 644 -t ${ZSHINSTALLDIR} completions/zsh/_crio-status ++ install ${SELINUXOPT} -d -m 755 ${DESTDIR}${BASHINSTALLDIR} ++ install ${SELINUXOPT} -d -m 755 ${DESTDIR}${FISHINSTALLDIR} ++ install ${SELINUXOPT} -d -m 755 ${DESTDIR}${ZSHINSTALLDIR} ++ install ${SELINUXOPT} -D -m 644 -t ${DESTDIR}${BASHINSTALLDIR} completions/bash/crio ++ install ${SELINUXOPT} -D -m 644 -t ${DESTDIR}${FISHINSTALLDIR} completions/fish/crio.fish ++ install ${SELINUXOPT} -D -m 644 -t ${DESTDIR}${ZSHINSTALLDIR} completions/zsh/_crio ++ install ${SELINUXOPT} -D -m 644 -t ${DESTDIR}${BASHINSTALLDIR} completions/bash/crio-status ++ install ${SELINUXOPT} -D -m 644 -t ${DESTDIR}${FISHINSTALLDIR} completions/fish/crio-status.fish ++ install ${SELINUXOPT} -D -m 644 -t ${DESTDIR}${ZSHINSTALLDIR} completions/zsh/_crio-status + + install.systemd: +- install ${SELINUXOPT} -D -m 644 contrib/systemd/crio.service $(PREFIX)/lib/systemd/system/crio.service +- install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-wipe.service $(PREFIX)/lib/systemd/system/crio-wipe.service ++ install ${SELINUXOPT} -D -m 644 contrib/systemd/crio.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio.service ++ install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-wipe.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio-wipe.service + + uninstall: +- rm -f $(BINDIR)/crio +- rm -f $(BINDIR)/crio-status +- rm -f $(BINDIR)/pinns ++ rm -f $(DESTDIR)$(BINDIR)/crio ++ rm -f $(DESTDIR)$(BINDIR)/crio-status ++ rm -f $(DESTDIR)$(BINDIR)/pinns + for i in $(filter %.5,$(MANPAGES)); do \ +- rm -f $(MANDIR)/man5/$$(basename $${i}); \ ++ rm -f $(DESTDIR)$(MANDIR)/man5/$$(basename $${i}); \ + done + for i in $(filter %.8,$(MANPAGES)); do \ +- rm -f $(MANDIR)/man8/$$(basename $${i}); \ ++ rm -f $(DESTDIR)$(MANDIR)/man8/$$(basename $${i}); \ + done +- rm -f ${BASHINSTALLDIR}/crio +- rm -f ${FISHINSTALLDIR}/crio.fish +- rm -f ${ZSHINSTALLDIR}/_crio +- rm -f ${BASHINSTALLDIR}/crio-status +- rm -f ${FISHINSTALLDIR}/crio-status.fish +- rm -f ${ZSHINSTALLDIR}/_crio-status +- rm -f $(PREFIX)/lib/systemd/system/crio-wipe.service +- rm -f $(PREFIX)/lib/systemd/system/crio.service +- rm -f $(PREFIX)/lib/systemd/system/cri-o.service +- rm -rf $(DATAROOTDIR)/oci/hooks.d +- rm -f $(ETCDIR_CRIO)/crio.conf +- rm -rf $(ETCDIR_CRIO)/crio.conf.d +- rm -f $(OCIUMOUNTINSTALLDIR)/crio-umount.conf +- rm -f $(CRICTL_CONFIG_DIR)/crictl.yaml ++ rm -f $(DESTDIR)${BASHINSTALLDIR}/crio ++ rm -f $(DESTDIR)${FISHINSTALLDIR}/crio.fish ++ rm -f $(DESTDIR)${ZSHINSTALLDIR}/_crio ++ rm -f $(DESTDIR)${BASHINSTALLDIR}/crio-status ++ rm -f $(DESTDIR)${FISHINSTALLDIR}/crio-status.fish ++ rm -f $(DESTDIR)${ZSHINSTALLDIR}/_crio-status ++ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio-wipe.service ++ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio.service ++ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/cri-o.service ++ rm -f $(DESTDIR)$(ETCDIR_CRIO)/crio.conf ++ rm -rf $(DESTDIR)$(ETCDIR_CRIO)/crio.conf.d ++ rm -rf $(DESTDIR)$(ETCDIR)/containers/oci/hooks.d ++ rm -rf $(DESTDIR)$(DATAROOTDIR)/oci/hooks.d ++ rm -f $(DESTDIR)$(OCIUMOUNTINSTALLDIR)/crio-umount.conf ++ rm -f $(DESTDIR)$(CRICTL_CONFIG_DIR)/crictl.yaml + + docs-validation: + $(GO_RUN) -tags "$(BUILDTAGS)" ./test/docs-validation diff --git a/v3.15/cri-o/remove-systemd-files.patch b/v3.15/cri-o/remove-systemd-files.patch new file mode 100644 index 0000000..9f8e545 --- /dev/null +++ b/v3.15/cri-o/remove-systemd-files.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 19f8052..135385c 100644 +--- a/Makefile ++++ b/Makefile +@@ -403,7 +403,7 @@ get-script: + sed -i '/# INCLUDE/q' scripts/get + cat contrib/bundle/install-paths contrib/bundle/install >> scripts/get + +-install: .gopathok install.bin install.man install.completions install.systemd install.config ++install: .gopathok install.bin install.man install.completions install.config + + install.bin-nobuild: + install ${SELINUXOPT} -D -m 755 bin/crio $(BINDIR)/crio diff --git a/v3.15/cri-tools/APKBUILD b/v3.15/cri-tools/APKBUILD index 67ea9b8..4186a49 100644 --- a/v3.15/cri-tools/APKBUILD +++ b/v3.15/cri-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista # Maintainer: Francesco Colista pkgname=cri-tools -pkgver=1.21.0 -pkgrel=0 +pkgver=1.22.0 +pkgrel=1 pkgdesc="CLI tool for Kubelet Container Runtime Interface (CRI)" url="https://github.com/kubernetes-sigs/cri-tools" arch="x86_64 aarch64 ppc64le s390x armv7 x86" @@ -20,5 +20,5 @@ package() { install -Dm755 build/bin/critest "$pkgdir/usr/bin/critest" } sha512sums=" -a307f5526fb8b7b23a1635b168a8f3b9b9b4bd6ccb94d461dc5af2065e6d1be527dadcb1c86e04808b244d0851a4901ee78a0263f58cf673f6ca503621d5eb61 cri-tools-1.21.0.tar.gz +4a2751ebe0b1ed7cb739a71230272ace0cbddc516abba39c6bf07d5e2648bd60e2139935b77a5388028887915162c957f652ea05434ff7865256721d10f863df cri-tools-1.22.0.tar.gz " diff --git a/v3.15/kubernetes/APKBUILD b/v3.15/kubernetes/APKBUILD index 466dc18..d4d91ff 100644 --- a/v3.15/kubernetes/APKBUILD +++ b/v3.15/kubernetes/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Dave # Maintainer: Francesco Colista pkgname=kubernetes -pkgver=1.21.9 +pkgver=1.22.8 pkgrel=0 pkgdesc="Container Cluster Manager" url="https://kubernetes.io/" @@ -35,6 +35,8 @@ subpackages=" 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 " source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes/kubernetes/archive/v$pkgver.tar.gz @@ -99,6 +101,9 @@ _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 @@ -187,12 +192,23 @@ _do_bashcomp() { "$builddir"/_output/local/bin/linux/*/$_pkgname completion bash>"$subpkgdir"/usr/share/bash-completion/completions/$_pkgname } +_do_zshcomp() { + local _pkgname=$1 + 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 \ + > "$subpkgdir"/usr/share/zsh/site-functions/_$_pkgname +} + cleanup_srcdir() { go clean -modcache default_cleanup_srcdir } + sha512sums=" -d334cab0fa3c173c12eb73c2f6f34a8745447525c6524ebd556cd18587345012e518a2ddb77484f48e01f4bbd795177b0c8b067bdf66715f60a70b0566ac66e8 kubernetes-1.21.9.tar.gz +b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a kubernetes-1.22.8.tar.gz bfe072d2f53543b8d704319755f3cfe5ed2467b54879e22117a25a9d7d6d4d238356e45824deaf4d18b8e9eb6f34d1de43be4840b9906f7909478ffe9e8a65ff ensure-cgo-usage.patch 052a0b06de417704f87361f00195063d1aaba0e12ae80a21342613061df2b37b908265e7375604d5f6283767da45363310ec1d9f9e0c17aa616c040c8ecbb267 make-e2e_node-run-over-distro-bins.patch 56201491d2dfe3a487931cbf5c6e60af898701b9541a936d80e3823948fcfb98508e3d51f4aaa415ce971f7bd20a7b51f74f025c76b83f58d5a8de8ce0ab679b make-test-cmd-run-over-hyperkube-based-kubectl.patch @@ -209,6 +225,6 @@ d7e022ee22da191bda7382f87cb293d9c9d115a3df0c2054bf918279eb866f99c6d5c21e4c98eae8 af88b382ab75657d0ff13c3f8f6d924cef9f2df7807a9a27daa63495981801bc4b607998f65c0758c11a7e070e43c24f7184ba7720711109c74b1c4d57919e34 kube-scheduler.confd 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6 kube-scheduler.logrotated 70fb5c95a02083025f38b099fa50d1a1e8893bc4141955031c4129c0d4aa20fde05c565c3f2e5b6ea31efb954673aeb8289f22eadcedeb7cb89e197898dfc65d kubelet.initd -e6a1d33e8b986b076fd7144ed74abda6aed20d45c138dca6d88c5a27fbf61d6bf10c4b8530b8c7a1ea9df63deb70ab47273142169e79e0b3c7a135d0b11017ec kubelet.confd +ce7d2b5bff5ac6af45f413b4dc2dd62c7bfa9a0b06ab348730da85ceb851ed0d09763215889d3f867ce2250a599ee0113a9bee018068a740500ab10616dd7610 kubelet.confd dda5fb57b55926fd2e9cebe6c1593da699afba0398c58dfa8b923c53a9ae6e63d765778577211460047f20863a6095e8e2ab3e7769e38c4f6a1c55c0e3485501 kubelet.logrotated " diff --git a/v3.15/kubernetes/kubelet.confd b/v3.15/kubernetes/kubelet.confd index f0415d0..b6d8492 100644 --- a/v3.15/kubernetes/kubelet.confd +++ b/v3.15/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 --config=/var/lib/kubelet/config.yaml" +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"