testing/kubernetes: added support for env variable

Follow up on https://gitlab.alpinelinux.org/alpine/aports/-/issues/11758

Introduced the following ENV variables read from the init:

KUBE_APISERVER_ARGS
KUBE_CONTROLLER_MANAGER_ARGS
KUBE_PROXY_ARGS
KUBE_SCHEDULER_ARGS
KUBELET_ARGS (renamed from KUBELET_KUBEADM_ARGS for name consistency)

6 files changed, 31 insertions, 11 deletions

diff --git a/testing/kubernetes/APKBUILD b/testing/kubernetes/APKBUILD
index c4d934460c..c291b9da31 100644
--- a/testing/kubernetes/APKBUILD
+++ b/testing/kubernetes/APKBUILD
@@ -5,7 +5,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=kubernetes
 pkgver=1.18.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Container Cluster Manager"
 url="https://kubernetes.io/"
 arch="x86_64 aarch64 ppc64le"
@@ -180,18 +180,18 @@ sha512sums="8715b5738ae13455e5f91f58d8922e7e87ed9441a5caf1233426df7dac552ddf2c42
 bfe072d2f53543b8d704319755f3cfe5ed2467b54879e22117a25a9d7d6d4d238356e45824deaf4d18b8e9eb6f34d1de43be4840b9906f7909478ffe9e8a65ff  ensure-cgo-usage.patch
 8faa8f1c777740ed33ac4e46e8e47e9092098b6e672cf57a10caab2212b9b5c6965361fe7107d1311227e6145e2ad312982dc0340feb36b03ebb04e1202366f0  make-e2e_node-run-over-distro-bins.patch
 56201491d2dfe3a487931cbf5c6e60af898701b9541a936d80e3823948fcfb98508e3d51f4aaa415ce971f7bd20a7b51f74f025c76b83f58d5a8de8ce0ab679b  make-test-cmd-run-over-hyperkube-based-kubectl.patch
-4ffb7688053dc00f3d72d11311d56994af492fd9da82415639c132af4019e093d58ec454390dca1494481d867c4c023e9af59b6312ee2ee5cb68f1f898285d26  kube-apiserver.initd
+c4e83ab6e4a7da79ae152f72626041574566e4c28b4383f624fae815c225457535a7c3cc061be3ecb61a0f97573a772d558c22997af4d508e9cdb71875bc05e0  kube-apiserver.initd
 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee  kube-apiserver.confd
 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e  kube-apiserver.logrotated
-41e0f789fdcfa0c0f3644328324a4ab970348fedebcb93734a6c2031df309342f4a2e8cf81c77ce39acb0008f7526ea46c1378e9518b5af3e7c1a16c0aba0bd8  kube-controller-manager.initd
+bbfeb7815c25cb2e4a4b87289d93d6d1b0dcc33fb9dd7b3658805d9f93bb1487866e924450388d03470de6d4407c9f69a4be3a12d3c22b37e34291ec54de152d  kube-controller-manager.initd
 347dcf514abec4bc94036955d0fb2d32f141a39d1a70d7fb37e7bf8eb5792e5c29560d500a08aafcd3e19422d04466004b832bca7108eb2815610feb144688fe  kube-controller-manager.confd
 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c  kube-controller-manager.logrotated
-6285bec9c94b19916634f5534e72b3b71f774abcfa0863375bc529b12b04a67fbd847e6c4956a36ac6b62b91b5aeb250c3eb8695bf19b926d551a4c9c201de89  kube-proxy.initd
+76fc620da9aa95708479341c5333870b68b754ad2d2fc12f75b8aa4b8ddd83794a17919d07b53be31651743418bf9ec851e2aca4cf653220a10ec7fc47e411c6  kube-proxy.initd
 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018  kube-proxy.confd
 d7e022ee22da191bda7382f87cb293d9c9d115a3df0c2054bf918279eb866f99c6d5c21e4c98eae84bacf925f7793bbe3087e0bcf6732ccb33844d15e4386fb5  kube-proxy.logrotated
-f83b210de921d5067f303cb8bc023188d1d4f016918ae424821ae04e307d921315c353db597237fab3c3436ecc4bd32bbdade5ed87d938c5ddddff0fbae04508  kube-scheduler.initd
+0b30a2689e58a0efdfc0b0896ba543d96c7046abe0e53d46854596f065bd95d077c828b80a0adc8cf6263684f26d76465825f14055772ea762f2e0554fc5ecad  kube-scheduler.initd
 af88b382ab75657d0ff13c3f8f6d924cef9f2df7807a9a27daa63495981801bc4b607998f65c0758c11a7e070e43c24f7184ba7720711109c74b1c4d57919e34  kube-scheduler.confd
 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6  kube-scheduler.logrotated
-3233f9c3eb699e187f6f15189438db61331c6c85c9565487856a74d7c252e51ff08fac05bf54cdd99be51399d228a8d81ee0108593b82432eb06f87c62b50ace  kubelet.initd
+b11a548dbe21df434eb0fec242e77a86d0e5f29ed5e24d8bc006697a5fbfdb0e091660a76a626ff9153bd903fb4dd527cbb62c5e5ad41057d1d0528ba6bc5dd5  kubelet.initd
 e6a1d33e8b986b076fd7144ed74abda6aed20d45c138dca6d88c5a27fbf61d6bf10c4b8530b8c7a1ea9df63deb70ab47273142169e79e0b3c7a135d0b11017ec  kubelet.confd
 dda5fb57b55926fd2e9cebe6c1593da699afba0398c58dfa8b923c53a9ae6e63d765778577211460047f20863a6095e8e2ab3e7769e38c4f6a1c55c0e3485501  kubelet.logrotated"
diff --git a/testing/kubernetes/kube-apiserver.initd b/testing/kubernetes/kube-apiserver.initd
index 320ec3407d..07acbedefc 100755
--- a/testing/kubernetes/kube-apiserver.initd
+++ b/testing/kubernetes/kube-apiserver.initd
@@ -4,8 +4,13 @@
 
 supervisor=supervise-daemon
 description="Kubernetes API Server"
+
+if [ -e /var/lib/kubelet/kubeadm-flags.env ]; then
+        . /var/lib/kubelet/kubeadm-flags.env;
+fi
+
 command="/usr/bin/kube-apiserver"
-command_args="${command_args}"
+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}
 
diff --git a/testing/kubernetes/kube-controller-manager.initd b/testing/kubernetes/kube-controller-manager.initd
index ce08bc3c2b..1468647930 100755
--- a/testing/kubernetes/kube-controller-manager.initd
+++ b/testing/kubernetes/kube-controller-manager.initd
@@ -4,8 +4,13 @@
 
 supervisor=supervise-daemon
 description="Kubernetes Controller Manager service"
+
+if [ -e /var/lib/kubelet/kubeadm-flags.env ]; then
+        . /var/lib/kubelet/kubeadm-flags.env;
+fi
+
 command="/usr/bin/kube-controller-manager"
-command_args="${command_args}"
+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}
 
diff --git a/testing/kubernetes/kube-proxy.initd b/testing/kubernetes/kube-proxy.initd
index 489c2cd06d..0ae0a6480f 100755
--- a/testing/kubernetes/kube-proxy.initd
+++ b/testing/kubernetes/kube-proxy.initd
@@ -4,8 +4,13 @@
 
 supervisor=supervise-daemon
 description="Kubernetes Proxy service"
+
+if [ -e /var/lib/kubelet/kubeadm-flags.env ]; then
+        . /var/lib/kubelet/kubeadm-flags.env;
+fi
+
 command="/usr/bin/kube-proxy"
-command_args="${command_args}"
+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}
 
diff --git a/testing/kubernetes/kube-scheduler.initd b/testing/kubernetes/kube-scheduler.initd
index 146ca30507..42af94a7b1 100755
--- a/testing/kubernetes/kube-scheduler.initd
+++ b/testing/kubernetes/kube-scheduler.initd
@@ -4,8 +4,13 @@
 
 supervisor=supervise-daemon
 description="Kubernetes Scheduler service"
+
+if [ -e /var/lib/kubelet/kubeadm-flags.env ]; then
+        . /var/lib/kubelet/kubeadm-flags.env;
+fi
+
 command="/usr/bin/kube-scheduler"
-command_args="${command_args}"
+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}
 
diff --git a/testing/kubernetes/kubelet.initd b/testing/kubernetes/kubelet.initd
index 59674464b5..3490a1d4eb 100755
--- a/testing/kubernetes/kubelet.initd
+++ b/testing/kubernetes/kubelet.initd
@@ -10,7 +10,7 @@ if [ -e /var/lib/kubelet/kubeadm-flags.env ]; then
 fi
 
 command="/usr/bin/kubelet"
-command_args="${command_args} ${KUBELET_KUBEADM_ARGS}"
+command_args="${command_args} ${KUBELET_ARGS}"
 : ${output_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}
 : ${error_log:=/var/log/$RC_SVCNAME/$RC_SVCNAME.log}