From 08d60999fc25562ad8039c48f532a8d82f13afb4 Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Thu, 17 Nov 2016 12:31:00 +0100
Subject: [PATCH] Allow passing custom list of admission plugins to kubemark

---
 test/kubemark/start-kubemark-master.sh | 1 -
 test/kubemark/start-kubemark.sh        | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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" <<EOF
+--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota
+EOF
+else
+  cat >> "${RESOURCE_DIRECTORY}/apiserver_flags" <<EOF
+--admission-control=${CUSTOM_ADMISSION_PLUGINS}
+EOF
+fi
 sed -i'' -e "s/\"//g" "${RESOURCE_DIRECTORY}/apiserver_flags"
 
   cat > "${RESOURCE_DIRECTORY}/scheduler_flags" <<EOF