github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue
2016-10-07 17:56:09 -07:00
committed by GitHub
parent 2ecd96100e bd1f75a4a2
commit e19e78916c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/layers/kubernetes/templates/master.json
View File

@@ -38,7 +38,7 @@
"--etcd-certfile={{ etcd_cert }}", "--etcd-certfile={{ etcd_cert }}",
{%- endif %} {%- endif %}
"--etcd-servers={{ connection_string }}", "--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", "--client-ca-file=/srv/kubernetes/ca.crt",
"--basic-auth-file=/srv/kubernetes/basic_auth.csv", "--basic-auth-file=/srv/kubernetes/basic_auth.csv",
"--min-request-timeout=300", "--min-request-timeout=300",