From 25164537efdcc87bb491d05a87d291defae9a78a Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Wed, 4 May 2016 16:53:59 +0200 Subject: [PATCH] ref --- cluster/gce/config-test.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 4ac04647f86..bfc7317d32b 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -86,11 +86,16 @@ KUBEPROXY_TEST_LOG_LEVEL="${KUBEPROXY_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}" TEST_CLUSTER_DELETE_COLLECTION_WORKERS="${TEST_CLUSTER_DELETE_COLLECTION_WORKERS:---delete-collection-workers=1}" TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=3m}" -KUBELET_TEST_ARGS="--max-pods=110 --serialize-image-pulls=false --outofdisk-transition-frequency=0" -APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${TEST_CLUSTER_DELETE_COLLECTION_WORKERS}" -CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_RESYNC_PERIOD}" -SCHEDULER_TEST_ARGS="" -KUBEPROXY_TEST_ARGS="" +# ContentType used to store objects in underlying database. +TEST_CLUSTER_CONTENT_TYPE="${TEST_CLUSTER_CONTENT_TYPE:-}" +# ContentType used by all components to communicate with apiserver. +TEST_CLUSTER_CLIENT_CONTENT_TYPE="${TEST_CLUSTER_CLIENT_CONTENT_TYPE:-}" + +KUBELET_TEST_ARGS="--max-pods=110 --serialize-image-pulls=false --outofdisk-transition-frequency=0 ${TEST_CLUSTER_CLIENT_CONTENT_TYPE}" +APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${TEST_CLUSTER_DELETE_COLLECTION_WORKERS} ${TEST_CLUSTER_CONTENT_TYPE}" +CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_RESYNC_PERIOD} ${TEST_CLUSTER_CLIENT_CONTENT_TYPE}" +SCHEDULER_TEST_ARGS="${TEST_CLUSTER_CLIENT_CONTENT_TYPE}" +KUBEPROXY_TEST_ARGS="${TEST_CLUSTER_CLIENT_CONTENT_TYPE}" # Optional: Enable node logging. ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}"