cdd4caf4df
The version of Salt we're running doesn't do a good job of detecting systemd. Inspired by https://github.com/saltstack/salt/issues/13926, I added a provider-force to the services. With this change, salt-call -l debug state.highstate succeeds, even for repeated invocations. The issue was (probably) benign, but definitely caused noised (e.g. #11297)
86 lines
2.2 KiB
Plaintext
86 lines
2.2 KiB
Plaintext
{% if pillar.get('is_systemd') %}
|
|
{% set environment_file = '/etc/sysconfig/kubelet' %}
|
|
{% else %}
|
|
{% set environment_file = '/etc/default/kubelet' %}
|
|
{% endif %}
|
|
|
|
{{ environment_file}}:
|
|
file.managed:
|
|
- source: salt://kubelet/default
|
|
- template: jinja
|
|
- user: root
|
|
- group: root
|
|
- mode: 644
|
|
|
|
/usr/local/bin/kubelet:
|
|
file.managed:
|
|
- source: salt://kube-bins/kubelet
|
|
- user: root
|
|
- group: root
|
|
- mode: 755
|
|
|
|
# The default here is that this file is blank. If this is the case, the kubelet
|
|
# won't be able to parse it as JSON and it will not be able to publish events
|
|
# to the apiserver. You'll see a single error line in the kubelet start up file
|
|
# about this.
|
|
/var/lib/kubelet/kubeconfig:
|
|
file.managed:
|
|
- source: salt://kubelet/kubeconfig
|
|
- user: root
|
|
- group: root
|
|
- mode: 400
|
|
- makedirs: true
|
|
|
|
|
|
{% if pillar.get('is_systemd') %}
|
|
|
|
{{ pillar.get('systemd_system_path') }}/kubelet.service:
|
|
file.managed:
|
|
- source: salt://kubelet/kubelet.service
|
|
- user: root
|
|
- group: root
|
|
|
|
# The service.running block below doesn't work reliably
|
|
# Instead we run our script which e.g. does a systemd daemon-reload
|
|
# But we keep the service block below, so it can be used by dependencies
|
|
# TODO: Fix this
|
|
fix-service-kubelet:
|
|
cmd.wait:
|
|
- name: /opt/kubernetes/helpers/services bounce kubelet
|
|
- watch:
|
|
- file: /usr/local/bin/kubelet
|
|
- file: {{ pillar.get('systemd_system_path') }}/kubelet.service
|
|
- file: {{ environment_file }}
|
|
- file: /var/lib/kubelet/kubeconfig
|
|
|
|
{% else %}
|
|
|
|
/etc/init.d/kubelet:
|
|
file.managed:
|
|
- source: salt://kubelet/initd
|
|
- user: root
|
|
- group: root
|
|
- mode: 755
|
|
|
|
{% endif %}
|
|
|
|
kubelet:
|
|
service.running:
|
|
- enable: True
|
|
- watch:
|
|
- file: /usr/local/bin/kubelet
|
|
{% if pillar.get('is_systemd') %}
|
|
- file: {{ pillar.get('systemd_system_path') }}/kubelet.service
|
|
{% else %}
|
|
- file: /etc/init.d/kubelet
|
|
{% endif %}
|
|
{% if grains['os_family'] == 'RedHat' %}
|
|
- file: /usr/lib/systemd/system/kubelet.service
|
|
{% endif %}
|
|
- file: {{ environment_file }}
|
|
- file: /var/lib/kubelet/kubeconfig
|
|
{% if pillar.get('is_systemd') %}
|
|
- provider:
|
|
- service: systemd
|
|
{%- endif %}
|