github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19326 from fgimenez/juju-allow-privileged

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-28 22:27:32 -08:00
commit 992a85950f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
View File

@ -8,6 +8,7 @@ limit nofile 20000 20000
kill timeout 30 # wait 30s between SIGTERM and SIGKILL.
exec /usr/local/bin/apiserver \
--allow-privileged=true \
--basic-auth-file=/srv/kubernetes/basic-auth.csv \
--bind-address=%(api_private_address)s \
--etcd-servers=%(etcd_servers)s \

1
cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl
View File

@ -9,6 +9,7 @@ kill timeout 60 # wait 60s between SIGTERM and SIGKILL.
exec /usr/local/bin/kubelet \
--address=%(kubelet_bind_addr)s \
--allow-privileged=true \
--api-servers=%(kubeapi_server)s \
--hostname-override=%(kubelet_bind_addr)s \
--cadvisor-port=4193 \