github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72989 from mbrannock/kubemark-apiserver-args

Browse Source 
Append kubemark apiserver args after defaults
This commit is contained in:
Kubernetes Prow Robot 2019-01-16 18:29:36 -08:00 committed by GitHub
commit 3be5e73eff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/kubemark/resources/start-kubemark-master.sh
View File

@ -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 {
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}"
} }