From d8f10dcac5afbdd389aef3f062a418aed2b35e59 Mon Sep 17 00:00:00 2001 From: Matt Brannock Date: Wed, 16 Jan 2019 13:42:51 -0800 Subject: [PATCH] Append kubemark apiserver args after defaults This allows for overriding defaults (e.g. max requests inflight) in prow job configs by using KUBEMARK_APISERVER_TEST_ARGS. These are passed to the start-kubemark-master.sh script as APISERVER_TEST_ARGS. --- test/kubemark/resources/start-kubemark-master.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/kubemark/resources/start-kubemark-master.sh b/test/kubemark/resources/start-kubemark-master.sh index 9b813b19a18..1eaf178bf61 100755 --- a/test/kubemark/resources/start-kubemark-master.sh +++ b/test/kubemark/resources/start-kubemark-master.sh @@ -487,8 +487,7 @@ function compute-etcd-events-params { # Computes command line arguments to be passed to apiserver. function compute-kube-apiserver-params { - local params="${APISERVER_TEST_ARGS:-}" - params+=" --insecure-bind-address=0.0.0.0" + local params="--insecure-bind-address=0.0.0.0" params+=" --etcd-servers=${ETCD_SERVERS:-http://127.0.0.1:2379}" if [[ -z "${ETCD_SERVERS:-}" ]]; then params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-/events#${EVENT_STORE_URL}}" @@ -549,6 +548,9 @@ function compute-kube-apiserver-params { params+=" --audit-log-maxbackup=0" params+=" --audit-log-maxsize=2000000000" fi + # Append APISERVER_TEST_ARGS to the end, which will allow for + # the above defaults to be overridden. + params+=" ${APISERVER_TEST_ARGS:-}" echo "${params}" }