Skip to content

K
k3s
Commit 992a8595 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

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

Auto commit by PR queue bot
parents 554382b5 b677d94b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
cluster/juju/charms/trusty/kubernetes-master/files/apiserver.upstart.tmpl
View file @ 992a8595
...@@ -8,6 +8,7 @@ limit nofile 20000 20000 ...@@ -8,6 +8,7 @@ limit nofile 20000 20000
kill timeout 30 # wait 30s between SIGTERM and SIGKILL. kill timeout 30 # wait 30s between SIGTERM and SIGKILL.
exec /usr/local/bin/apiserver \ exec /usr/local/bin/apiserver \
--allow-privileged=true \
--basic-auth-file=/srv/kubernetes/basic-auth.csv \ --basic-auth-file=/srv/kubernetes/basic-auth.csv \
--bind-address=%(api_private_address)s \ --bind-address=%(api_private_address)s \
--etcd-servers=%(etcd_servers)s \ --etcd-servers=%(etcd_servers)s \
......
cluster/juju/charms/trusty/kubernetes/files/kubelet.upstart.tmpl
View file @ 992a8595
...@@ -9,6 +9,7 @@ kill timeout 60 # wait 60s between SIGTERM and SIGKILL. ...@@ -9,6 +9,7 @@ kill timeout 60 # wait 60s between SIGTERM and SIGKILL.
exec /usr/local/bin/kubelet \ exec /usr/local/bin/kubelet \
--address=%(kubelet_bind_addr)s \ --address=%(kubelet_bind_addr)s \
--allow-privileged=true \
--api-servers=%(kubeapi_server)s \ --api-servers=%(kubeapi_server)s \
--hostname-override=%(kubelet_bind_addr)s \ --hostname-override=%(kubelet_bind_addr)s \
--cadvisor-port=4193 \ --cadvisor-port=4193 \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment