chore: Cleanup releases

This commit is contained in:
Stefan Reimer 2022-10-03 20:24:01 +02:00
parent a0d711ac01
commit 9baa040457
92 changed files with 6 additions and 1122 deletions

View File

@ -9,7 +9,7 @@ CF_DIST := E1YFUJXMCXT2RN
all: build
packages:
mkdir -p packages/$(RELEASE)/aarch64 packages/$(RELEASE)/x86_64
mkdir -p packages/kubezero/aarch64 packages/kubezero/x86_64
distfiles:
mkdir -p distfiles
@ -24,7 +24,7 @@ build: packages distfiles
-v ${PWD}/distfiles:/var/cache/distfiles \
-v ${PWD}/packages:/home/alpine/packages \
-v ${PWD}/aports:/home/alpine/aports \
-v ${PWD}/$(RELEASE)/:/home/alpine/$(RELEASE) \
-v ${PWD}/kubezero:/home/alpine/kubezero \
-v ${HOME}/.gitconfig/:/home/alpine/.gitconfig:ro \
-v ${HOME}/.abuild/:/home/alpine/.abuild:ro \
public.ecr.aws/zero-downtime/alpine-builder:${BUILDER} $(PKG)
@ -36,7 +36,7 @@ invalidate:
aws cloudfront create-invalidation --distribution $(CF_DIST) --paths "/alpine/*"
upload: invalidate
aws s3 sync --delete packages/$(RELEASE)/x86_64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --exclude APKINDEX.tar.gz
aws s3 sync --delete packages/$(RELEASE)/aarch64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/aarch64/ --exclude APKINDEX.tar.gz
aws s3 cp packages/$(RELEASE)/x86_64/APKINDEX.tar.gz s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --cache-control max-age=1
aws s3 cp packages/$(RELEASE)/aarch64/APKINDEX.tar.gz s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/aarch64/ --cache-control max-age=1
aws s3 sync --delete packages/kubezero/x86_64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --exclude APKINDEX.tar.gz
aws s3 sync --delete packages/kubezero/aarch64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/aarch64/ --exclude APKINDEX.tar.gz
aws s3 cp packages/kubezero/x86_64/APKINDEX.tar.gz s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --cache-control max-age=1
aws s3 cp packages/kubezero/aarch64/APKINDEX.tar.gz s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/aarch64/ --cache-control max-age=1

View File

@ -1,24 +0,0 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=aws-iam-authenticator
pkgver=0.5.7
pkgrel=1
pkgdesc="AWS aws-iam-authenticator"
url="https://github.com/kubernetes-sigs/aws-iam-authenticator"
arch="x86_64 aarch64 armv7 x86"
license="Apache-2.0"
makedepends="go bash"
options="!check chmod-clean"
source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes-sigs/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
build() {
make bin
}
package() {
install -Dm755 "$builddir/_output/bin/aws-iam-authenticator" "$pkgdir"/usr/bin/aws-iam-authenticator
}
sha512sums="
64d0959555a39f0fd1f55e689495507a3d1fd005ced4287ea853750915c1953a328f794a37799b4f0936fca2a009fa7d7fdb432be79468b643f5f967edaf8f9c aws-iam-authenticator-0.5.7.tar.gz
"

View File

@ -1,46 +0,0 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=aws-neuron-driver
pkgver=2.3.3.0
pkgrel=0
pkgdesc="Linux Kernel module for AWS Neuron INF instances"
url="https://github.com/aws/aws-neuron-driver"
arch="x86_64"
license="GPL-2.0"
makedepends="bash xz linux-headers linux-virt-dev"
options="!check"
# apt-get download --print-uris aws-neuron-dkms | cut -d' ' -f1
source="$pkgname-$pkgver.deb::https://apt.repos.neuron.amazonaws.com/pool/main/a/aws-neuron-dkms/aws-neuron-dkms_"$pkgver"_amd64.deb"
unpack() {
ar -x /var/cache/distfiles/$pkgname-$pkgver.deb
tar xfJ data.tar.xz
mv usr/src/aws-neuron-$pkgver $srcdir/$pkgname-$pkgver
# What is wrong with AWS ?
find $srcdir/$pkgname-$pkgver -type d -exec chmod 755 {} \;
}
build() {
# Hack running the build inside a container other uname -r returns host kernel
KERNEL_VERSION=$(basename $(ls -d /lib/modules/*-virt))
make KERNEL_SRC_DIR=/lib/modules/$KERNEL_VERSION/build
}
package() {
KERNEL_VERSION=$(basename $(ls -d /lib/modules/*-virt))
mkdir -p "$pkgdir"/lib/modules/$KERNEL_VERSION "$pkgdir"/lib/udev/rules.d
cp neuron.ko "$pkgdir"/lib/modules/$KERNEL_VERSION
echo 'KERNEL=="neuron*", MODE="0666"' > "$pkgdir"/lib/udev/rules.d/90-neuron-udev.rules
depends="linux-virt=$(apk info linux-virt -d | grep description: | awk '{print $1}' | sed -e 's/linux-virt-//')"
}
sha512sums="
1719a211d52581acdc0a3cf2279761e1748ec2008831b97b41592fc03cf732eef34ec273f8adaf8822ae4e5a080335f541632f41ffc0ac87063e49b77a243948 aws-neuron-driver-2.3.3.0.deb
"

View File

@ -1,96 +0,0 @@
# Contributor: ungleich <foss@ungleich.ch>
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: ungleich <foss@ungleich.ch>
pkgname=cri-o
pkgver=1.22.4
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
"

View File

@ -1,24 +0,0 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cri-tools
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"
license="Apache-2.0"
makedepends="go"
options="!check" # no check available
source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes-sigs/cri-tools/archive/v$pkgver.tar.gz"
build() {
make all
}
package() {
install -Dm755 build/bin/crictl "$pkgdir/usr/bin/crictl"
install -Dm755 build/bin/critest "$pkgdir/usr/bin/critest"
}
sha512sums="
4a2751ebe0b1ed7cb739a71230272ace0cbddc516abba39c6bf07d5e2648bd60e2139935b77a5388028887915162c957f652ea05434ff7865256721d10f863df cri-tools-1.22.0.tar.gz
"

View File

@ -1,27 +0,0 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=ecr-credential-provider
pkgver=1.22.0
pkgrel=1
pkgdesc="AWS Kubernetes ecr-credential-provider"
url="https://github.com/kubernetes/cloud-provider-aws"
arch="x86_64 aarch64 armv7 x86"
license="Apache-2.0"
makedepends="go bash"
options="!check chmod-clean"
source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes/cloud-provider-aws/archive/refs/tags/v$pkgver.tar.gz"
builddir="$srcdir/cloud-provider-aws-$pkgver"
build() {
make GOFLAGS="-buildmode=pie -v" GOLDFLAGS="-extldflags=-static -w -s" ecr-credential-provider
}
package() {
mkdir -p "$pkgdir"/usr/libexec/kubernetes/kubelet-plugins
install -Dm755 "$builddir/ecr-credential-provider" "$pkgdir"/usr/libexec/kubernetes/kubelet-plugins
}
sha512sums="
6253694167a390920fa55378ad1c7e5d4be7ec84fbd27e4d9aefe79e46bbef1ad617ffe8bda9fdbfd2a0353b9fb6d71231dc130f7a235729bc427eccd9080e94 cloud-provider-aws-1.22.0.tar.gz
"

View File

@ -1,87 +0,0 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=fluent-bit
pkgver=1.9.3
pkgrel=0
pkgdesc="Fast and Lightweight Log processor and forwarder"
url="https://fluentbit.io/"
# riscv64: does not support bundled luajit
arch="all !ppc64le !s390x !riscv64"
license="Apache-2.0"
makedepends="
bison
cmake
flex
fts-dev
gtest-dev
zlib-dev
"
subpackages="
$pkgname-dev
$pkgname-openrc
"
source="$pkgname-$pkgver.tar.gz::https://github.com/fluent/fluent-bit/archive/v$pkgver.tar.gz
fluent-bit.confd
fluent-bit.initd
chunkio-static-lib-fts.patch
"
# enable check when this solved - https://github.com/fluent/fluent-bit/issues/2464#issuecomment-673280055
# Disable all things AWS to make tests pass
options="!check"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
# default CORE_STACK_SIZE=((3 * PTHREAD_STACK_MIN) / 2)=3072 is invalid
# set default to 24576
# Disable stream processor due to issue see: https://github.com/fluent/fluent-bit/issues/2464
cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_EXE_LINKER_FLAGS="-static" \
-DFLB_CORO_STACK_SIZE=24576 \
-DFLB_RELEASE=Yes \
-DFLB_DEBUG=No \
-DFLB_SHARED_LIB=No \
-DFLB_JEMALLOC=Yes \
-DFLB_IN_SYSTEMD=No \
-DFLB_PROXY_GO=No \
-DFLB_HTTP_SERVER=Yes \
-DFLB_STREAM_PROCESSOR=No \
$CMAKE_CROSSOPTS .
make -C build
#-DFLB_TESTS_INTERNAL=Yes \
#-DFLB_AWS=No \
#-DFLB_SIGNV4=No \
#-DFLB_OUT_S3=No \
#-DFLB_OUT_CLOUDWATCH_LOGS=No \
#-DFLB_OUT_KINESIS_FIREHOSE=No \
#-DFLB_OUT_KINESIS_STREAMS=No \
#-DFLB_OUT_BIGQUERY=No \
#-DFLB_FILTER_AWS=No \
}
check() {
CTEST_OUTPUT_ON_FAILURE=1 make -C build test
}
package() {
make -C build DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/$pkgname.initd \
"$pkgdir"/etc/init.d/$pkgname
install -Dm644 "$srcdir"/$pkgname.confd \
"$pkgdir"/etc/conf.d/$pkgname
mv "$pkgdir"/usr/etc/* "$pkgdir"/etc
}
sha512sums="
40fe86014ff97bc54cecb8c3251263b002659c3c79e825109334b3dc9ebfabac1f8872e2d0a2096fda169bdbd35d3fa8edc934338fd2ac100d48444c96c1af02 fluent-bit-1.9.3.tar.gz
f6431397c80a036980b5377b51e38aec25dfceeb8dbe4cd54dce1f6e77d669d9f8daf983fcc96d25332385888f1809ced5e8ab0e8ccfcd93d19494036e3dc949 fluent-bit.confd
8ba6c8e84dee90176f9b4375fb2c6444fa5d32fa601d9bcf3ea7960fec87f1ef664f175caf08bd0b052843e971efdbf08e2a5cd180ad9a8f23ff2c5cb233814f fluent-bit.initd
6bd7d8b4da93a17f29b6ea1e0286ea226d0e376024284741110936779b3229bd8d6cd03ffbdc5d3b4842294e7f32a888de0dd16b0851b65d91b062ca58530ea0 chunkio-static-lib-fts.patch
"

View File

@ -1,230 +0,0 @@
# 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>
pkgname=kubernetes
pkgver=1.22.8
pkgrel=0
pkgdesc="Container Cluster Manager"
url="https://kubernetes.io/"
arch="x86_64 aarch64 ppc64le armv7 x86"
license="Apache-2.0"
options="!check chmod-clean" # Tests hang
_kube_proxy_deps="iptables"
_kubelet_deps="iptables"
_kubeadm_deps="iproute2 socat ethtool conntrack-tools cri-tools"
makedepends="go go-bindata linux-headers rsync grep findutils bash
$_kube_proxy_deps
$_kubelet_deps
$_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
"
source="$pkgname-$pkgver.tar.gz::https://github.com/kubernetes/kubernetes/archive/v$pkgver.tar.gz
ensure-cgo-usage.patch
make-e2e_node-run-over-distro-bins.patch
make-test-cmd-run-over-hyperkube-based-kubectl.patch
kube-apiserver.initd
kube-apiserver.confd
kube-apiserver.logrotated
kube-controller-manager.initd
kube-controller-manager.confd
kube-controller-manager.logrotated
kube-proxy.initd
kube-proxy.confd
kube-proxy.logrotated
kube-scheduler.initd
kube-scheduler.confd
kube-scheduler.logrotated
kubelet.initd
kubelet.confd
kubelet.logrotated"
_agent="kubelet"
_cli="kubeadm kubectl"
_services="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
build() {
make generated_files
for _pkgs in $_agent $_cli $_services ; do
make GOFLAGS="-buildmode=pie -v -tags=providerless" GOLDFLAGS="-extldflags=-static -w -s" WHAT=cmd/$_pkgs
done
}
package() {
for bin in $_agent $_cli $_services; do
install -Dm755 _output/local/bin/linux/*/$bin "$pkgdir"/usr/bin/$bin
done
mkdir -p "$pkgdir"/etc/kubernetes
}
_do_subpkg() {
local _pkg=$1
pkgdesc="Kubernetes - $_pkg"
case "$_pkg" in
kubelet) depends="$_kubelet_deps" ;;
kubeadm) depends="$_kubeadm_deps" ;;
esac
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/$_pkg "$subpkgdir"/usr/bin
return 0
}
_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
install -d "$subpkgdir"/var/log/kubelet
install -Dm644 "$srcdir"/kubelet.logrotated "$subpkgdir"/etc/logrotate.d/kubelet
}
_kubelet_openrc() {
pkgdesc="Kubernetes - kubelet (OpenRC init scripts)"
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
}
_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
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
}
_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="
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
e690daff2adb1013c92124f32e71f8ed9a18c611ae6ae5fcb5ce9674768dbf9d911a05d7e4028488cda886e63b82e8ac0606d14389a05844c1b5538a33dd09d1 kube-apiserver.initd
302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee kube-apiserver.confd
1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e kube-apiserver.logrotated
90b9a9708e6d7c9084de17c8b28cbf6ff543400128d47f4d168883d8d3461b4dcbbb1796950a12ffc79b0f341b3881b48bba7651e3c232c1731a7e6dbddb62b8 kube-controller-manager.initd
347dcf514abec4bc94036955d0fb2d32f141a39d1a70d7fb37e7bf8eb5792e5c29560d500a08aafcd3e19422d04466004b832bca7108eb2815610feb144688fe kube-controller-manager.confd
e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c kube-controller-manager.logrotated
cd43587f69bd9fc6f1fdf0896d99df89377f677f4fa9b367dcaee1bf6f66469577dd79c60833ba0cd60ffdb68deedd0fb9bc00caa2b06854af4e6e56f1ffe365 kube-proxy.initd
4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018 kube-proxy.confd
d7e022ee22da191bda7382f87cb293d9c9d115a3df0c2054bf918279eb866f99c6d5c21e4c98eae84bacf925f7793bbe3087e0bcf6732ccb33844d15e4386fb5 kube-proxy.logrotated
561bef5633ba4b9021720624443d9c279a561e5fabea76e5d0fbee2e7ad8999029a2511a45895fbec8448026212a3c5b4c197b248a6afa7f8bd945f705524ea7 kube-scheduler.initd
af88b382ab75657d0ff13c3f8f6d924cef9f2df7807a9a27daa63495981801bc4b607998f65c0758c11a7e070e43c24f7184ba7720711109c74b1c4d57919e34 kube-scheduler.confd
3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6 kube-scheduler.logrotated
70fb5c95a02083025f38b099fa50d1a1e8893bc4141955031c4129c0d4aa20fde05c565c3f2e5b6ea31efb954673aeb8289f22eadcedeb7cb89e197898dfc65d kubelet.initd
ce7d2b5bff5ac6af45f413b4dc2dd62c7bfa9a0b06ab348730da85ceb851ed0d09763215889d3f867ce2250a599ee0113a9bee018068a740500ab10616dd7610 kubelet.confd
dda5fb57b55926fd2e9cebe6c1593da699afba0398c58dfa8b923c53a9ae6e63d765778577211460047f20863a6095e8e2ab3e7769e38c4f6a1c55c0e3485501 kubelet.logrotated
"

View File

@ -1,32 +0,0 @@
From: Tiago Ilieve <tiago.myhro@gmail.com>
Date: Sat, 27 Oct 2018 10:47:42 +0000
Subject: [PATCH] Ensure CGO usage
There are checks to define if CGO is required by the platform, but those
are not enough to ensure its usage in Alpine. This leads to errors like:
/usr/lib/go/pkg/tool/linux_amd64/link: running gcc failed: exit status 1
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x8): undefined reference to `x_cgo_callers'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x10): undefined reference to `x_cgo_init'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x18): undefined reference to `x_cgo_mmap'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x20): undefined reference to `x_cgo_munmap'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x28): undefined reference to `x_cgo_notify_runtime_init_done'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x30): undefined reference to `x_cgo_sigaction'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x38): undefined reference to `x_cgo_thread_start'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x5b0): undefined reference to `x_cgo_setenv'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x5b8): undefined reference to `x_cgo_unsetenv'
/usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: /tmp/go-link-879017147/go.o:(.data+0x5c0): undefined reference to `_cgo_yield'
collect2: error: ld returned 1 exit status
---
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -611,7 +611,7 @@
-asmflags "${goasmflags:-}"
-ldflags "${goldflags:-}"
)
- CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}"
+ CGO_ENABLED=1 kube::golang::build_some_binaries "${statics[@]}"
fi
if [[ "${#nonstatics[@]}" != 0 ]]; then

View File

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

View File

@ -1,13 +0,0 @@
diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
index f72ced2a..de4ab961 100755
--- a/hack/make-rules/test-e2e-node.sh
+++ b/hack/make-rules/test-e2e-node.sh
@@ -206,6 +206,7 @@ else
--ginkgo-flags="${ginkgoflags}" --test-flags="--container-runtime=${runtime} \
--alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \
${test_args}" --runtime-config="${runtime_config}" \
- --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
+ --k8s-bin-dir "/usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
+
exit $?
fi

18
v3.16/.gitignore vendored
View File

@ -1,18 +0,0 @@
*.apk
*.gz
*.tgz
*.bz2
*.tbz2
*.zip
*.tags
*.xz
*.part
*.tar
src
pkg
pkg-*
tmp
build.log
core
!core/
.vscode/

View File

@ -1,23 +0,0 @@
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"

View File

@ -1,5 +0,0 @@
[crio.runtime]
# Overide defaults to not use systemd cgroups.
conmon_cgroup = "pod"
cgroup_manager = "cgroupfs"

View File

@ -1,35 +0,0 @@
#!/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 $?
}

View File

@ -1,7 +0,0 @@
/var/log/crio/crio.log {
missingok
size 5M
rotate 3
compress
copytruncate
}

View File

@ -1,44 +0,0 @@
--- 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"' \

View File

@ -1,138 +0,0 @@
--- 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

View File

@ -1,13 +0,0 @@
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

View File

@ -1,26 +0,0 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=etcdhelper
pkgver=0.1.0
pkgrel=0
pkgdesc="etcdhelper tool to edit and inspect etcd data"
url="https://git.zero-downtime.net/ZeroDownTime/etcdhelper"
arch="x86_64 aarch64"
license="AGPL-3.0"
makedepends="go bash"
options="!check chmod-clean"
source="$pkgname-$pkgver.tar.gz::https://git.zero-downtime.net/ZeroDownTime/etcdhelper/archive/"$pkgver".tar.gz"
builddir="$srcdir/etcdhelper"
build() {
make
}
package() {
install -Dm755 build/etcdhelper "$pkgdir"/usr/bin/etcdhelper
}
sha512sums="
97abd4e5a0078112a048037512b041bcefb9e660131403e9c87bf5fc8b632eb17ab66d20a477a2ef4808f54ae29941d74bd61390143e5781058d7bbd4333dd78 etcdhelper-0.1.0.tar.gz
"

View File

@ -1,10 +0,0 @@
--- a/lib/chunkio/src/CMakeLists.txt
+++ b/lib/chunkio/src/CMakeLists.txt
@@ -12,6 +12,7 @@
)
set(libs cio-crc32)
+set(libs ${libs} fts)
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(src

View File

@ -1 +0,0 @@
fluentbit_opts="-c /etc/fluent-bit/fluent-bit.conf"

View File

@ -1,11 +0,0 @@
#!/sbin/openrc-run
supervisor=supervise-daemon
name=fluent-bit
command="/usr/bin/fluent-bit"
command_args="$fluentbit_opts"
depend() {
need net
after firewall
}

View File

@ -1,7 +0,0 @@
###
# kubernetes system config
#
# The following values are used to configure the kube-apiserver
#
command_args=""

View File

@ -1,21 +0,0 @@
#!/sbin/openrc-run
# Copyright 2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
supervisor=supervise-daemon
description="Kubernetes API Server"
if [ -e /var/lib/kubernetes/kube-apiserver-flags.env ]; then
. /var/lib/kubernetes/kube-apiserver-flags.env;
fi
command="/usr/bin/kube-apiserver"
command_args="${command_args} ${KUBE_APISERVER_ARGS}"
: ${output_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
: ${error_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
depend() {
after net
}

View File

@ -1,7 +0,0 @@
/var/log/kube-apiserver/*.log {
missingok
size 5M
rotate 3
compress
copytruncate
}

View File

@ -1,7 +0,0 @@
###
# kubernetes system config
#
# The following values are used to configure the kube-controller-manager
#
command_args=""

View File

@ -1,19 +0,0 @@
#!/sbin/openrc-run
# Copyright 2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
supervisor=supervise-daemon
description="Kubernetes Controller Manager service"
if [ -e /var/lib/kubernetes/kube-controller-manager-flags.env ]; then
. /var/lib/kubernetes/kube-controller-manager-flags.env;
fi
command="/usr/bin/kube-controller-manager"
command_args="${command_args} ${KUBE_CONTROLLER_MANAGER_ARGS}"
: ${output_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
: ${error_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
depend() {
after net
}

View File

@ -1,7 +0,0 @@
/var/log/kube-controller-manager/*.log {
missingok
size 5M
rotate 3
compress
copytruncate
}

View File

@ -1,4 +0,0 @@
###
# Kubernetes kube-proxy config
#
command_args=""

View File

@ -1,20 +0,0 @@
#!/sbin/openrc-run
# Copyright 2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
supervisor=supervise-daemon
description="Kubernetes Proxy service"
if [ -e /var/lib/kubernetes/kube-proxy-flags.env ]; then
. /var/lib/kubernetes/kube-proxy-flags.env;
fi
command="/usr/bin/kube-proxy"
command_args="${command_args} ${KUBE_PROXY_ARGS}"
: ${output_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
: ${error_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
depend() {
after net
}

View File

@ -1,8 +0,0 @@
/var/log/kube-proxy/*.log {
missingok
size 5M
rotate 3
compress
copytruncate
}

View File

@ -1,7 +0,0 @@
###
# kubernetes system config
#
# The following values are used to configure the kube-scheduler
#
command_args=""

View File

@ -1,19 +0,0 @@
#!/sbin/openrc-run
# Copyright 2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
supervisor=supervise-daemon
description="Kubernetes Scheduler service"
if [ -e /var/lib/kubernetes/kube-scheduler-flags.env ]; then
. /var/lib/kubernetes/kube-scheduler-flags.env;
fi
command="/usr/bin/kube-scheduler"
command_args="${command_args} ${KUBE_SCHEDULER_ARGS}"
: ${output_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
: ${error_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
depend() {
after net
}

View File

@ -1,7 +0,0 @@
/var/log/kube-scheduler/*.log {
missingok
size 5M
rotate 3
compress
copytruncate
}

View File

@ -1 +0,0 @@
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"

View File

@ -1,21 +0,0 @@
#!/sbin/openrc-run
# Copyright 2016-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
supervisor=supervise-daemon
description="Kubelet, a Kubernetes node agent"
if [ -e /var/lib/kubelet/kubeadm-flags.env ]; then
. /var/lib/kubelet/kubeadm-flags.env;
fi
command="/usr/bin/kubelet"
command_args="${command_args} ${KUBELET_KUBEADM_ARGS}"
pidfile="${KUBELET_PIDFILE:-/run/${RC_SVCNAME}.pid}"
: ${output_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
: ${error_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
depend() {
after net
need cgroups
}

View File

@ -1,19 +0,0 @@
diff --git a/hack/lib/test.sh b/hack/lib/test.sh
index 62a6765f..775d1d96 100644
--- a/hack/lib/test.sh
+++ b/hack/lib/test.sh
@@ -77,12 +77,12 @@ kube::test::object_assert() {
local object=$2
local request=$3
local expected=$4
- local args=${5:-}
+ local get_args=${5:-}
for j in $(seq 1 "${tries}"); do
# shellcheck disable=SC2086
# Disabling because "args" needs to allow for expansion here
- res=$(eval kubectl get "${kube_flags[@]}" ${args} "${object}" -o go-template=\""${request}"\")
+ res=$(eval kubectl ${args} get "${kube_flags[@]}" ${get_args} "${object}" -o go-template=\""${request}"\")
if [[ "${res}" =~ ^$expected$ ]]; then
echo -n "${green}"
echo "$(kube::test::get_caller 3): Successful get ${object} ${request}: ${res}"

View File

@ -1,24 +0,0 @@
# Contributor: Stefan Reimer <stefan@zero-downtime.net>
# Maintainer: Stefan Reimer <stefan@zero-downtime.net>
pkgname=openvpn_exporter
pkgver=0.3.1
pkgrel=0
pkgdesc="OpenVPN Prometheus Exporter"
url="https://github.com/StuartApp/openvpn_exporter.git"
arch="x86_64 aarch64"
license="AGPL-3.0"
makedepends="go bash"
options="!check chmod-clean"
source="$pkgname-$pkgver.tar.gz::https://github.com/StuartApp/openvpn_exporter/archive/refs/tags/v"$pkgver".tar.gz"
build() {
go build -ldflags "-s -w" -o build/openvpn_exporter
}
package() {
install -Dm755 build/openvpn_exporter "$pkgdir"/usr/bin/openvpn_exporter
}
sha512sums="
4133003120b3a76a46cc146c26e7418bf7e2db3c16ce3f621b28a3fa06516373388fd469d48f499526baa3f6b36cb8887a835f2833e6f315cdf18502949d2bb1 openvpn_exporter-0.3.1.tar.gz
"