github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18823 from runseb/patch-2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-18 10:38:01 -08:00
parent ae2fbc6daf 3f8504be80
commit 6f83ff6c8f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/hyperkube/master.json
View File

@@ -34,7 +34,7 @@
"--address=127.0.0.1", "--address=127.0.0.1",
"--etcd-servers=http://127.0.0.1:4001", "--etcd-servers=http://127.0.0.1:4001",
"--cluster-name=kubernetes", "--cluster-name=kubernetes",
"--admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ResourceQuota", "--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,SecurityContextDeny,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",