Skip to content

K
k3s
Commit d8f10dca authored by Matt Brannock's avatar Matt Brannock
Browse files
Options

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.
parent d6b74091
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
test/kubemark/resources/start-kubemark-master.sh
View file @ d8f10dca
...@@ -487,8 +487,7 @@ function compute-etcd-events-params { ...@@ -487,8 +487,7 @@ function compute-etcd-events-params {
# Computes command line arguments to be passed to apiserver. # Computes command line arguments to be passed to apiserver.
function compute-kube-apiserver-params { function compute-kube-apiserver-params {
local params="${APISERVER_TEST_ARGS:-}" local params="--insecure-bind-address=0.0.0.0"
params+=" --insecure-bind-address=0.0.0.0"
params+=" --etcd-servers=${ETCD_SERVERS:-http://127.0.0.1:2379}" params+=" --etcd-servers=${ETCD_SERVERS:-http://127.0.0.1:2379}"
if [[ -z "${ETCD_SERVERS:-}" ]]; then if [[ -z "${ETCD_SERVERS:-}" ]]; then
params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-/events#${EVENT_STORE_URL}}" params+=" --etcd-servers-overrides=${ETCD_SERVERS_OVERRIDES:-/events#${EVENT_STORE_URL}}"
...@@ -549,6 +548,9 @@ function compute-kube-apiserver-params { ...@@ -549,6 +548,9 @@ function compute-kube-apiserver-params {
params+=" --audit-log-maxbackup=0" params+=" --audit-log-maxbackup=0"
params+=" --audit-log-maxsize=2000000000" params+=" --audit-log-maxsize=2000000000"
fi fi
# Append APISERVER_TEST_ARGS to the end, which will allow for
# the above defaults to be overridden.
params+=" ${APISERVER_TEST_ARGS:-}"
echo "${params}" echo "${params}"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment