Merge pull request #31727 from mbruzek/remove-storage-plugin

Automatic merge from submit-queue Removing the Storage plugin from the juju cluster master.json manifest file **What this PR does / why we need it**: The Juju cluster fails to bring up the apiserver. Using the docker logs I see the API server complaining about a fatal error. ``` F0830 17:04:16.922997 1 plugins.go:143] Unknown admission plugin: DefaultStorageClass ``` **Which issue this PR fixes** : fixes #31726 **Special notes for your reviewer**: This is specifically for the Juju cluster provider. **Release note**: ``` release-note-none ```

Merge pull request #31727 from mbruzek/remove-storage-plugin
e19e7891 · Kubernetes Submit Queue · GitHub · 2ecd9610 · bd1f75a4 · e19e7891
Commit e19e7891 authored Oct 07, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

master.json cluster/juju/layers/kubernetes/templates/master.json +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes/templates/master.json
+++ b/cluster/juju/layers/kubernetes/templates/master.json
@@ -38,7 +38,7 @@
              "--etcd-certfile={{ etcd_cert }}",
              {%- endif %}
              "--etcd-servers={{ connection_string }}",
-              "--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,DefaultStorageClass,ResourceQuota",
+              "--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota",
              "--client-ca-file=/srv/kubernetes/ca.crt",
              "--basic-auth-file=/srv/kubernetes/basic_auth.csv",
              "--min-request-timeout=300",