github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix salt configuration on systemd setups

Browse Source
This commit is contained in:
derekwaynecarr 2015-08-05 17:01:43 -04:00
parent b12ef5c397
commit 0de0e3e9f1
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/kube-proxy/default
View File

@ -31,7 +31,5 @@
{% set test_args=pillar['kubeproxy_test_args'] %}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{kubeconfig}} {{pillar['log_level']}}"
# test_args has to be kept at the end, so they'll overwrite any prior configuration
DAEMON_ARGS="$DAEMON_ARGS + {{test_args}}"
DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{kubeconfig}} {{pillar['log_level']}} {{test_args}}"

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

@ -95,7 +95,5 @@
{% set test_args=pillar['kubelet_test_args'] %}
{% endif -%}
DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}}"
# test_args has to be kept at the end, so they'll overwrite any prior configuration
DAEMON_ARGS="$DAEMON_ARGS + {{test_args}}"
DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{test_args}}"