Merge pull request #13447 from pweil-/pid-mode

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-16 23:34:35 -07:00
37 changed files with 366 additions and 145 deletions

View File

@@ -201,7 +201,7 @@ function set_service_accounts {
function start_apiserver {
# Admission Controllers to invoke prior to persisting objects in cluster
ADMISSION_CONTROL=NamespaceLifecycle,NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
ADMISSION_CONTROL=NamespaceLifecycle,NamespaceAutoProvision,LimitRanger,SecurityContextDeny,ServiceAccount,DenyEscalatingExec,ResourceQuota
# This is the default dir and filename where the apiserver will generate a self-signed cert
# which should be able to be used as the CA to verify itself