fix: ensure we wait for the right CRI service name (#4115)

Azure · Dec 15, 2020 · f5e4f97 · f5e4f97
1 parent 3f77233
commit f5e4f97
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 62 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/docker-monitor.service b/parts/k8s/cloud-init/artifacts/docker-monitor.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=a script that checks docker health and restarts if needed
-After=docker.service
+After={{GetContainerRuntime}}.service
 [Service]
 Restart=always
 RestartSec=10

diff --git a/parts/k8s/cloud-init/artifacts/kubelet.service b/parts/k8s/cloud-init/artifacts/kubelet.service
@@ -1,11 +1,7 @@
 [Unit]
 Description=Kubelet
 ConditionPathExists=/usr/local/bin/kubelet
-{{- if NeedsContainerd}}
-Requires=containerd.service
-{{else}}
-Requires=docker.service
-{{- end}}
+Requires={{GetContainerRuntime}}.service
 
 [Service]
 Restart=always

diff --git a/parts/k8s/cloud-init/masternodecustomdata.yml b/parts/k8s/cloud-init/masternodecustomdata.yml
@@ -90,24 +90,14 @@ write_files:
     Slice={{- GetKubeReservedCgroup -}}.slice
     #EOF
 
-  {{if NeedsContainerd}}
-- path: /etc/systemd/system/containerd.service.d/kubereserved-slice.conf
+- path: /etc/systemd/system/{{GetContainerRuntime}}.service.d/kubereserved-slice.conf
   permissions: "0644"
   owner: root
   content: |
     [Service]
     Slice={{- GetKubeReservedCgroup -}}.slice
     #EOF
-  {{else}}
-- path: /etc/systemd/system/docker.service.d/kubereserved-slice.conf
-  permissions: "0644"
-  owner: root
-  content: |
-    [Service]
-    Slice={{- GetKubeReservedCgroup -}}.slice
-    #EOF
-  {{end}}
-{{end}}
+{{- end}}
 
 - path: /usr/local/bin/health-monitor.sh
   permissions: "0544"
@@ -139,6 +129,7 @@ write_files:
   content: !!binary |
     {{CloudInitData "kubeletSystemdService"}}
 
+{{- /* for historical reasons, we overload the name "docker" here; in fact this monitor service supports both docker and containerd */}}
 - path: /etc/systemd/system/docker-monitor.service
   permissions: "0644"
   encoding: gzip

diff --git a/parts/k8s/cloud-init/nodecustomdata.yml b/parts/k8s/cloud-init/nodecustomdata.yml
@@ -98,24 +98,14 @@ write_files:
     Slice={{- GetKubeReservedCgroup -}}.slice
     #EOF
 
-  {{if NeedsContainerd}}
-- path: /etc/systemd/system/containerd.service.d/kubereserved-slice.conf
+- path: /etc/systemd/system/{{GetContainerRuntime}}.service.d/kubereserved-slice.conf
   permissions: "0644"
   owner: root
   content: |
     [Service]
     Slice={{- GetKubeReservedCgroup -}}.slice
     #EOF
-  {{else}}
-- path: /etc/systemd/system/docker.service.d/kubereserved-slice.conf
-  permissions: "0644"
-  owner: root
-  content: |
-    [Service]
-    Slice={{- GetKubeReservedCgroup -}}.slice
-    #EOF
-  {{end}}
-{{end}}
+{{- end}}
 
 {{- if HasKubeletHealthZPort}}
 - path: /etc/systemd/system/kubelet-monitor.service
@@ -144,6 +134,7 @@ write_files:
   content: !!binary |
     {{CloudInitData "kubeletSystemdService"}}
 
+{{- /* for historical reasons, we overload the name "docker" here; in fact this monitor service supports both docker and containerd */}}
 - path: /etc/systemd/system/docker-monitor.service
   permissions: "0644"
   encoding: gzip
@@ -424,7 +415,7 @@ coreos:
       drop-ins:
         - name: "10-flatcar.conf"
           content: |
-            After=docker.service
+            After={{GetContainerRuntime}}.service
             [Service]
             ExecStart=
             ExecStart=/opt/bin/health-monitor.sh container-runtime

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go