github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Salt: clean daemon_args on RedHat, not systemd 

I don't think it actually makes a difference based on how we're using it,
but this is now more of a precise change.
pull/6/head
Justin Santa Barbara 2015-07-03 10:24:32 -04:00
parent ad0293e3f3
commit 60d822435b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

@ -1,5 +1,5 @@
{% set daemon_args = "$DAEMON_ARGS" -%}
{% if pillar.get('is_systemd') -%}
{% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" -%}
{% endif -%}

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

@ -1,5 +1,5 @@
{% set daemon_args = "$DAEMON_ARGS" -%}
{% if pillar.get('is_systemd') -%}
{% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" -%}
{% endif -%}
{# TODO(azure-maintainer): add support for distributing kubeconfig with token to kube-proxy #}

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

@ -1,5 +1,5 @@
{% set daemon_args = "$DAEMON_ARGS" -%}
{% if pillar.get('is_systemd') -%}
{% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" -%}
{% endif -%}