diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-02-05 00:05:06 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-02-05 00:05:06 +0100 |
| commit | 54f35367a7e672574a0ac7e116224f26d80d27e0 (patch) | |
| tree | 1c3bbf0308e05011a1c4a9c970555e6418378d5b /roles/kubernetes | |
| parent | ele-media: fix disksize (diff) | |
kubernetes: refactor cri-docker systemd unit names
Diffstat (limited to 'roles/kubernetes')
| -rw-r--r-- | roles/kubernetes/base/tasks/cri_docker.yml | 8 | ||||
| -rw-r--r-- | roles/kubernetes/base/templates/cri-docker.service.j2 (renamed from roles/kubernetes/base/templates/cri-dockerd.service.j2) | 2 | ||||
| -rw-r--r-- | roles/kubernetes/base/templates/cri-docker.socket.j2 (renamed from roles/kubernetes/base/templates/cri-dockerd.socket.j2) | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml index 91de6836..1e1001bb 100644 --- a/roles/kubernetes/base/tasks/cri_docker.yml +++ b/roles/kubernetes/base/tasks/cri_docker.yml @@ -14,7 +14,7 @@ copy: content: | [Unit] - After=cri-dockerd.service + After=cri-docker.service dest: /etc/systemd/system/kubelet.service.d/after-docker.conf - name: disable bridge and iptables in docker daemon config and switch to systemd cgroup driver @@ -43,8 +43,8 @@ - socket - service template: - src: "cri-dockerd.{{ item }}.j2" - dest: "/etc/systemd/system/cri-dockerd.{{ item }}" + src: "cri-docker.{{ item }}.j2" + dest: "/etc/systemd/system/cri-docker.{{ item }}" - name: make sure cri-docker is started and enabled loop: @@ -52,6 +52,6 @@ - service systemd: daemon_reload: yes - name: "cri-dockerd.{{ item }}" + name: "cri-docker.{{ item }}" enabled: yes state: started diff --git a/roles/kubernetes/base/templates/cri-dockerd.service.j2 b/roles/kubernetes/base/templates/cri-docker.service.j2 index a83a18f0..14f21a7c 100644 --- a/roles/kubernetes/base/templates/cri-dockerd.service.j2 +++ b/roles/kubernetes/base/templates/cri-docker.service.j2 @@ -3,7 +3,7 @@ Description=CRI Interface for Docker Application Container Engine Documentation=https://docs.mirantis.com After=network-online.target firewalld.service docker.service Wants=network-online.target -Requires=cri-dockerd.socket +Requires=cri-docker.socket StartLimitBurst=3 StartLimitIntervalSec=60s diff --git a/roles/kubernetes/base/templates/cri-dockerd.socket.j2 b/roles/kubernetes/base/templates/cri-docker.socket.j2 index 8dfa27d4..d240614e 100644 --- a/roles/kubernetes/base/templates/cri-dockerd.socket.j2 +++ b/roles/kubernetes/base/templates/cri-docker.socket.j2 @@ -1,6 +1,6 @@ [Unit] Description=CRI Docker Socket for the API -PartOf=cri-dockerd.service +PartOf=cri-docker.service [Socket] ListenStream=%t/cri-dockerd.sock |