Merge pull request #55322 from deads2k/demo-2

Automatic merge from submit-queue (batch tested with PRs 55301, 55319, 54018, 55322, 55125). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. enable webhook admission in local up cluster Adds GenericAdmissionWebhook to the default admission to match the initializers already present. This is a no-op unless someone actually chooses to create an admission webhook via config.

Merge pull request #55322 from deads2k/demo-2
ddcb1f0c · Kubernetes Submit Queue · GitHub · 1c9d6f53 · 5b6fa754 · ddcb1f0c
Unverified Commit ddcb1f0c authored Nov 08, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 08, 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
@@ -419,7 +419,7 @@ function start_apiserver {
    fi
    # Admission Controllers to invoke prior to persisting objects in cluster
-    ADMISSION_CONTROL=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount${security_admission},DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota
+    ADMISSION_CONTROL=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount${security_admission},DefaultStorageClass,DefaultTolerationSeconds,ResourceQuota,GenericAdmissionWebhook
    # 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