From 54f35367a7e672574a0ac7e116224f26d80d27e0 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 5 Feb 2022 00:05:06 +0100
Subject: kubernetes: refactor cri-docker systemd unit names

---
 roles/kubernetes/base/tasks/cri_docker.yml         |  8 +++----
 .../base/templates/cri-docker.service.j2           | 27 ++++++++++++++++++++++
 .../kubernetes/base/templates/cri-docker.socket.j2 | 12 ++++++++++
 .../base/templates/cri-dockerd.service.j2          | 27 ----------------------
 .../base/templates/cri-dockerd.socket.j2           | 12 ----------
 5 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 roles/kubernetes/base/templates/cri-docker.service.j2
 create mode 100644 roles/kubernetes/base/templates/cri-docker.socket.j2
 delete mode 100644 roles/kubernetes/base/templates/cri-dockerd.service.j2
 delete mode 100644 roles/kubernetes/base/templates/cri-dockerd.socket.j2

(limited to 'roles/kubernetes')

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-docker.service.j2 b/roles/kubernetes/base/templates/cri-docker.service.j2
new file mode 100644
index 00000000..14f21a7c
--- /dev/null
+++ b/roles/kubernetes/base/templates/cri-docker.service.j2
@@ -0,0 +1,27 @@
+[Unit]
+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-docker.socket
+StartLimitBurst=3
+StartLimitIntervalSec=60s
+
+[Service]
+Type=notify
+ExecStart=/usr/bin/cri-dockerd --container-runtime-endpoint fd:// --network-plugin=cni --cni-bin-dir=/opt/cni/bin --cni-conf-dir=/etc/cni/net.d
+ExecReload=/bin/kill -s HUP $MAINPID
+TimeoutSec=0
+RestartSec=2
+Restart=always
+# Having non-zero Limit*s causes performance problems due to accounting overhead
+# in the kernel. We recommend using cgroups to do container-local accounting.
+LimitNOFILE=infinity
+LimitNPROC=infinity
+LimitCORE=infinity
+TasksMax=infinity
+Delegate=yes
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/kubernetes/base/templates/cri-docker.socket.j2 b/roles/kubernetes/base/templates/cri-docker.socket.j2
new file mode 100644
index 00000000..d240614e
--- /dev/null
+++ b/roles/kubernetes/base/templates/cri-docker.socket.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=CRI Docker Socket for the API
+PartOf=cri-docker.service
+
+[Socket]
+ListenStream=%t/cri-dockerd.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=docker
+
+[Install]
+WantedBy=sockets.target
diff --git a/roles/kubernetes/base/templates/cri-dockerd.service.j2 b/roles/kubernetes/base/templates/cri-dockerd.service.j2
deleted file mode 100644
index a83a18f0..00000000
--- a/roles/kubernetes/base/templates/cri-dockerd.service.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-[Unit]
-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
-StartLimitBurst=3
-StartLimitIntervalSec=60s
-
-[Service]
-Type=notify
-ExecStart=/usr/bin/cri-dockerd --container-runtime-endpoint fd:// --network-plugin=cni --cni-bin-dir=/opt/cni/bin --cni-conf-dir=/etc/cni/net.d
-ExecReload=/bin/kill -s HUP $MAINPID
-TimeoutSec=0
-RestartSec=2
-Restart=always
-# Having non-zero Limit*s causes performance problems due to accounting overhead
-# in the kernel. We recommend using cgroups to do container-local accounting.
-LimitNOFILE=infinity
-LimitNPROC=infinity
-LimitCORE=infinity
-TasksMax=infinity
-Delegate=yes
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/kubernetes/base/templates/cri-dockerd.socket.j2 b/roles/kubernetes/base/templates/cri-dockerd.socket.j2
deleted file mode 100644
index 8dfa27d4..00000000
--- a/roles/kubernetes/base/templates/cri-dockerd.socket.j2
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=CRI Docker Socket for the API
-PartOf=cri-dockerd.service
-
-[Socket]
-ListenStream=%t/cri-dockerd.sock
-SocketMode=0660
-SocketUser=root
-SocketGroup=docker
-
-[Install]
-WantedBy=sockets.target
-- 
cgit v1.2.3