github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 12:46:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23829 from derekwaynecarr/fix_admission_order

Browse Source 
Automatic merge from submit-queue

ResourceQuota should be last admission controller

For background, see documentation:

http://kubernetes.io/docs/admin/admission-controllers/#resourcequota
This commit is contained in:
k8s-merge-robot
2016-04-20 04:58:04 -07:00
parent 15ed9dbd02 e3d58499db
commit b274911e0e
7 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/centos/config-default.sh
View File

@@ -41,7 +41,8 @@ export SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-"192.168.3.0/24"}
export FLANNEL_NET=${FLANNEL_NET:-"172.16.0.0/16"}
# Admission Controllers to invoke prior to persisting objects in cluster
export ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,ServiceAccount,ResourceQuota,SecurityContextDeny
# If we included ResourceQuota, we should keep it at the end of the list to prevent incremeting quota usage prematurely.
export ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,ServiceAccount,SecurityContextDeny,ResourceQuota
# Extra options to set on the Docker command line.
# This is useful for setting --insecure-registry for local registries.