diff --git a/test/kubemark/start-kubemark-master.sh b/test/kubemark/start-kubemark-master.sh index b04a87a5434..d16087a425a 100644 --- a/test/kubemark/start-kubemark-master.sh +++ b/test/kubemark/start-kubemark-master.sh @@ -122,7 +122,6 @@ kubernetes/server/bin/kube-apiserver \ --secure-port=443 \ --basic-auth-file=/srv/kubernetes/basic_auth.csv \ --target-ram-mb=$((${NUM_NODES} * 60)) \ - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota \ $(cat apiserver_flags) &> /var/log/kube-apiserver.log & # kube-contoller-manager now needs running kube-api server to actually start diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 551136ed3e9..4275066e062 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -28,6 +28,15 @@ ${APISERVER_TEST_ARGS} --storage-backend=${STORAGE_BACKEND} --service-cluster-ip-range="${SERVICE_CLUSTER_IP_RANGE}" EOF +if [ -z "${CUSTOM_ADMISSION_PLUGINS:-}"]; then + cat >> "${RESOURCE_DIRECTORY}/apiserver_flags" <> "${RESOURCE_DIRECTORY}/apiserver_flags" < "${RESOURCE_DIRECTORY}/scheduler_flags" <