feat: add 1.23.8 Kubernetes
This commit is contained in:
parent
39de082b70
commit
e662785fa7
224
v3.16/kubernetes/APKBUILD
Normal file
224
v3.16/kubernetes/APKBUILD
Normal file
@ -0,0 +1,224 @@
|
||||
# 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.23.8
|
||||
pkgrel=0
|
||||
pkgdesc="Container Cluster Manager"
|
||||
url="https://kubernetes.io/"
|
||||
# ppc64le: failed to build
|
||||
arch="x86_64 aarch64 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
|
||||
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
|
||||
}
|
||||
|
||||
sha512sums='
|
||||
e69250fbab9cfa6488ae69040a2f8cd7f269121e954cacdb2478a46bf519bcd05fedf0bca74b482386e44127be462d95488c1ec60be772506a0d7e736751885b kubernetes-1.23.8.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
|
||||
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
|
||||
603277e6bc73bd0463520c158a5ed03390bcb4874fd193529ad087409e2ea894c5856acf583d62a0dd3430d7e6938db28d1b3439c60c427c1c84db1dd81bfbff kubelet.logrotated
|
||||
'
|
7
v3.16/kubernetes/kube-apiserver.confd
Normal file
7
v3.16/kubernetes/kube-apiserver.confd
Normal file
@ -0,0 +1,7 @@
|
||||
###
|
||||
# kubernetes system config
|
||||
#
|
||||
# The following values are used to configure the kube-apiserver
|
||||
#
|
||||
|
||||
command_args=""
|
21
v3.16/kubernetes/kube-apiserver.initd
Executable file
21
v3.16/kubernetes/kube-apiserver.initd
Executable file
@ -0,0 +1,21 @@
|
||||
#!/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
|
||||
}
|
||||
|
7
v3.16/kubernetes/kube-apiserver.logrotated
Normal file
7
v3.16/kubernetes/kube-apiserver.logrotated
Normal file
@ -0,0 +1,7 @@
|
||||
/var/log/kube-apiserver/*.log {
|
||||
missingok
|
||||
size 5M
|
||||
rotate 3
|
||||
compress
|
||||
copytruncate
|
||||
}
|
7
v3.16/kubernetes/kube-controller-manager.confd
Normal file
7
v3.16/kubernetes/kube-controller-manager.confd
Normal file
@ -0,0 +1,7 @@
|
||||
###
|
||||
# kubernetes system config
|
||||
#
|
||||
# The following values are used to configure the kube-controller-manager
|
||||
#
|
||||
|
||||
command_args=""
|
19
v3.16/kubernetes/kube-controller-manager.initd
Executable file
19
v3.16/kubernetes/kube-controller-manager.initd
Executable file
@ -0,0 +1,19 @@
|
||||
#!/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
|
||||
}
|
7
v3.16/kubernetes/kube-controller-manager.logrotated
Normal file
7
v3.16/kubernetes/kube-controller-manager.logrotated
Normal file
@ -0,0 +1,7 @@
|
||||
/var/log/kube-controller-manager/*.log {
|
||||
missingok
|
||||
size 5M
|
||||
rotate 3
|
||||
compress
|
||||
copytruncate
|
||||
}
|
4
v3.16/kubernetes/kube-proxy.confd
Normal file
4
v3.16/kubernetes/kube-proxy.confd
Normal file
@ -0,0 +1,4 @@
|
||||
###
|
||||
# Kubernetes kube-proxy config
|
||||
#
|
||||
command_args=""
|
20
v3.16/kubernetes/kube-proxy.initd
Executable file
20
v3.16/kubernetes/kube-proxy.initd
Executable file
@ -0,0 +1,20 @@
|
||||
#!/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
|
||||
}
|
||||
|
8
v3.16/kubernetes/kube-proxy.logrotated
Normal file
8
v3.16/kubernetes/kube-proxy.logrotated
Normal file
@ -0,0 +1,8 @@
|
||||
/var/log/kube-proxy/*.log {
|
||||
missingok
|
||||
size 5M
|
||||
rotate 3
|
||||
compress
|
||||
copytruncate
|
||||
}
|
||||
|
7
v3.16/kubernetes/kube-scheduler.confd
Normal file
7
v3.16/kubernetes/kube-scheduler.confd
Normal file
@ -0,0 +1,7 @@
|
||||
###
|
||||
# kubernetes system config
|
||||
#
|
||||
# The following values are used to configure the kube-scheduler
|
||||
#
|
||||
|
||||
command_args=""
|
19
v3.16/kubernetes/kube-scheduler.initd
Executable file
19
v3.16/kubernetes/kube-scheduler.initd
Executable file
@ -0,0 +1,19 @@
|
||||
#!/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
|
||||
}
|
7
v3.16/kubernetes/kube-scheduler.logrotated
Normal file
7
v3.16/kubernetes/kube-scheduler.logrotated
Normal file
@ -0,0 +1,7 @@
|
||||
/var/log/kube-scheduler/*.log {
|
||||
missingok
|
||||
size 5M
|
||||
rotate 3
|
||||
compress
|
||||
copytruncate
|
||||
}
|
1
v3.16/kubernetes/kubelet.confd
Normal file
1
v3.16/kubernetes/kubelet.confd
Normal file
@ -0,0 +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"
|
21
v3.16/kubernetes/kubelet.initd
Executable file
21
v3.16/kubernetes/kubelet.initd
Executable file
@ -0,0 +1,21 @@
|
||||
#!/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
|
||||
}
|
8
v3.16/kubernetes/kubelet.logrotated
Normal file
8
v3.16/kubernetes/kubelet.logrotated
Normal file
@ -0,0 +1,8 @@
|
||||
/var/log/kubelet/*.log {
|
||||
nodateext
|
||||
missingok
|
||||
size 10M
|
||||
rotate 3
|
||||
compress
|
||||
copytruncate
|
||||
}
|
12
v3.16/kubernetes/make-e2e_node-run-over-distro-bins.patch
Normal file
12
v3.16/kubernetes/make-e2e_node-run-over-distro-bins.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
|
||||
index fb0720a7..43a57c1f 100755
|
||||
--- a/hack/make-rules/test-e2e-node.sh
|
||||
+++ b/hack/make-rules/test-e2e-node.sh
|
||||
@@ -240,6 +240,6 @@ else
|
||||
--alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \
|
||||
${test_args}" --runtime-config="${runtime_config}" \
|
||||
--kubelet-config-file="${kubelet_config_file}" \
|
||||
- --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
|
@ -0,0 +1,19 @@
|
||||
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}"
|
Loading…
Reference in New Issue
Block a user