Merge pull request #44278 from aveshagarwal/master-fix-resource-quota

Automatic merge from submit-queue (batch tested with PRs 49990, 49997, 44278, 49936, 49891) Move ResourceQuota plugin at the end of the admission plugin chain. @liggitt @derekwaynecarr

Merge pull request #44278 from aveshagarwal/master-fix-resource-quota
0f10e612 · Kubernetes Submit Queue · GitHub · 508ccc40 · b6b26ae9 · 0f10e612
Commit 0f10e612 authored Aug 02, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

local-up-cluster.sh hack/local-up-cluster.sh +1 -1

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -406,7 +406,7 @@ function start_apiserver {
    fi

    # Admission Controllers to invoke prior to persisting objects in cluster
-    ADMISSION_CONTROL=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount${security_admission},ResourceQuota,DefaultStorageClass,DefaultTolerationSeconds
+    ADMISSION_CONTROL=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount${security_admission},DefaultStorageClass,DefaultTolerationSeconds,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