github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Allow passing custom list of admission plugins to kubemark

Browse Source
This commit is contained in:
gmarek 2016-11-17 12:31:00 +01:00
parent 4241a42ad5
commit 08d60999fc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/kubemark/start-kubemark-master.sh
View File

@ -122,7 +122,6 @@ kubernetes/server/bin/kube-apiserver \
--secure-port=443 \ --secure-port=443 \
--basic-auth-file=/srv/kubernetes/basic_auth.csv \ --basic-auth-file=/srv/kubernetes/basic_auth.csv \
--target-ram-mb=$((${NUM_NODES} * 60)) \ --target-ram-mb=$((${NUM_NODES} * 60)) \
--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota \
$(cat apiserver_flags) &> /var/log/kube-apiserver.log & $(cat apiserver_flags) &> /var/log/kube-apiserver.log &
# kube-contoller-manager now needs running kube-api server to actually start # kube-contoller-manager now needs running kube-api server to actually start

9
test/kubemark/start-kubemark.sh
View File

@ -28,6 +28,15 @@ ${APISERVER_TEST_ARGS}
--storage-backend=${STORAGE_BACKEND} --storage-backend=${STORAGE_BACKEND}
--service-cluster-ip-range="${SERVICE_CLUSTER_IP_RANGE}" --service-cluster-ip-range="${SERVICE_CLUSTER_IP_RANGE}"
EOF 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" sed -i'' -e "s/\"//g" "${RESOURCE_DIRECTORY}/apiserver_flags"
cat > "${RESOURCE_DIRECTORY}/scheduler_flags" <<EOF cat > "${RESOURCE_DIRECTORY}/scheduler_flags" <<EOF