Skip to content

K
k3s
Commit 656be14e authored by Victor Marmol's avatar Victor Marmol
Browse files
Options

Run Docker containers as top-level containers in Debian.

Part of #8215
parent 295d0564
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
cluster/saltbase/salt/kubelet/default
View file @ 656be14e
...@@ -58,4 +58,10 @@ ...@@ -58,4 +58,10 @@
{% set configure_cbr0 = "--configure-cbr0=" + pillar['allocate_node_cidrs'] -%} {% set configure_cbr0 = "--configure-cbr0=" + pillar['allocate_node_cidrs'] -%}
{% endif -%} {% endif -%}
DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{hostname_override}} {{cloud_provider}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{configure_cbr0}}" # Run containers under the root cgroup.
{% set cgroup_root = "" -%}
{% if grains['os_family'] == 'Debian' -%}
{% set cgroup_root = "--cgroup_root=/" -%}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{hostname_override}} {{cloud_provider}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{configure_cbr0}} {{cgroup_root}}"
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