Skip to content

K
k3s
Commit b4d1c754 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #19870 from justinsb/salt_systemd_force

Auto commit by PR queue bot
parents 2bea9e73 cdd4caf4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
cluster/saltbase/salt/kube-addons/init.sls
View file @ b4d1c754
...@@ -212,3 +212,7 @@ kube-addons: ...@@ -212,3 +212,7 @@ kube-addons:
{% else %} {% else %}
- file: /etc/init.d/kube-addons - file: /etc/init.d/kube-addons
{% endif %} {% endif %}
{% if pillar.get('is_systemd') %}
- provider:
- service: systemd
{%- endif %}
cluster/saltbase/salt/kubelet/init.sls
View file @ b4d1c754
...@@ -79,3 +79,7 @@ kubelet: ...@@ -79,3 +79,7 @@ kubelet:
{% endif %} {% endif %}
- file: {{ environment_file }} - file: {{ environment_file }}
- file: /var/lib/kubelet/kubeconfig - file: /var/lib/kubelet/kubeconfig
{% if pillar.get('is_systemd') %}
- provider:
- service: systemd
{%- 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