Skip to content

K
k3s
Commit efce770f authored by Justin Santa Barbara's avatar Justin Santa Barbara Committed by Tim Hockin
Browse files
Options

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.
parent aff1ffc3
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View file @ efce770f
{% set daemon_args = "$DAEMON_ARGS" -%}
{% if pillar.get('is_systemd') -%}
{% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" -%}
{% endif -%}
......
cluster/saltbase/salt/kube-proxy/default
View file @ efce770f
{% 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 #}
......
cluster/saltbase/salt/kubelet/default
View file @ efce770f
{% set daemon_args = "$DAEMON_ARGS" -%}
{% if pillar.get('is_systemd') -%}
{% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" -%}
{% endif -%}
......
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