Merge pull request #36810 from gmarek/secrets

Automatic merge from submit-queue

Add ServiceAccounts to kubemark

cc @yujuhong
This commit is contained in:
Kubernetes Submit Queue
2016-11-16 06:01:30 -08:00
committed by GitHub
4 changed files with 9 additions and 1 deletions

View File

@@ -81,6 +81,9 @@
"cpu": "50m",
"memory": "100M"
}
},
"securityContext": {
"privileged": true
}
},

View File

@@ -122,6 +122,7 @@ 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