github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1345 from brendandburns/privilege

Browse Source 
Add a salt flag for enabling privileged containers.
This commit is contained in:
Joe Beda 2014-09-17 14:50:32 -07:00
commit b83276a872
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/pillar/privilege.sls Normal file
View File

@ -0,0 +1,2 @@
# If true, allow privileged containers to be created by API
allow_privileged: false

1
cluster/saltbase/pillar/top.sls
View File

@ -2,3 +2,4 @@ base:
'*': '*':
- mine - mine
- common - common
- privilege

2
cluster/saltbase/salt/apiserver/default
View File

@ -52,4 +52,4 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }}" DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }} --allow_privileged {{pillars['allow_privileged']}}"

3
cluster/saltbase/salt/kubelet/default
View File

@ -16,4 +16,5 @@
{% set hostname_override = " -hostname_override=" + grains.minion_ip %} {% set hostname_override = " -hostname_override=" + grains.minion_ip %}
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} {{address}} {{config}}"
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} {{address}} {{config}} --allow_privileged {{pillars['allow_privileged']}}"