Merge lp:~fgimenez/charms/trusty/kubernetes-master/allow-privileged into lp:~kubernetes/charms/trusty/kubernetes-master/trunk

Proposed by Federico Gimenez
Status: Needs review
Proposed branch: lp:~fgimenez/charms/trusty/kubernetes-master/allow-privileged
Merge into: lp:~kubernetes/charms/trusty/kubernetes-master/trunk
Diff against target: 11 lines (+1/-0)
1 file modified
files/apiserver.upstart.tmpl (+1/-0)
To merge this branch: bzr merge lp:~fgimenez/charms/trusty/kubernetes-master/allow-privileged
Reviewer Review Type Date Requested Status
Kubernetes Charmers Pending
Review via email: mp+281072@code.launchpad.net

Commit message

Pass allow-privileged=true option to kubelet startup command

Description of the change

Pass allow-privileged=true option to apiserver startup command

According to [1] and [2], in order to be able to start containers in privileged mode you should pass the required option to the apiserver at start time.

Please, let me know if anything else is needed, in terms of filing a bug, writing tests, etc.

Thanks!

[1] https://github.com/kubernetes/kubernetes/issues/391
[2] http://kubernetes.io/v1.1/docs/admin/kube-apiserver.html

To post a comment you must log in.

Unmerged revisions

15. By Federico Gimenez

Pass allow-privileged=true option to apiserver startup command

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'files/apiserver.upstart.tmpl'
2--- files/apiserver.upstart.tmpl 2015-10-05 21:55:51 +0000
3+++ files/apiserver.upstart.tmpl 2015-12-21 09:51:19 +0000
4@@ -8,6 +8,7 @@
5 kill timeout 30 # wait 30s between SIGTERM and SIGKILL.
6
7 exec /usr/local/bin/apiserver \
8+ --allow-privileged=true \
9 --basic-auth-file=/srv/kubernetes/basic-auth.csv \
10 --bind-address=%(api_private_address)s \
11 --etcd-servers=%(etcd_servers)s \

Subscribers

People subscribed via source and target branches