Merge pull request #18823 from runseb/patch-2

Auto commit by PR queue bot

Merge pull request #18823 from runseb/patch-2
6f83ff6c · k8s-merge-robot · ae2fbc6d · 3f8504be · 6f83ff6c
Commit 6f83ff6c authored Dec 18, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

master.json cluster/images/hyperkube/master.json +1 -1

No files found.
--- a/cluster/images/hyperkube/master.json
+++ b/cluster/images/hyperkube/master.json
@@ -34,7 +34,7 @@
              "--address=127.0.0.1",
              "--etcd-servers=http://127.0.0.1:4001",
              "--cluster-name=kubernetes",
-              "--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ResourceQuota",
+              "--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,SecurityContextDeny,ResourceQuota",
              "--client-ca-file=/srv/kubernetes/ca.crt",
              "--basic-auth-file=/srv/kubernetes/basic_auth.csv",
              "--min-request-timeout=300",