Support docker 18.09 in the test script.

Random-Liu · estesp · commit 90ef88d69286 · 2020-10-01T16:51:40.000-04:00
Signed-off-by: Lantao Liu &lt;lantaol@google.com&gt;
diff --git a/contrib/gce/cloud-init/master.yaml b/contrib/gce/cloud-init/master.yaml
@@ -174,6 +174,8 @@ write_files:
       WantedBy=multi-user.target
 
 runcmd:
+  # Stop the existing containerd service if there is one. (for Docker 18.09+)
+  - systemctl is-active containerd && systemctl stop containerd
   - systemctl daemon-reload
   - systemctl enable containerd-installation.service
   - systemctl enable containerd.service
@@ -186,3 +188,5 @@ runcmd:
   - systemctl enable kube-logrotate.service
   - systemctl enable kubernetes.target
   - systemctl start kubernetes.target
+  # Start docker after containerd is running. (for Docker 18.09+)
+  - systemctl is-enabled docker && (systemctl is-active docker || systemctl start docker)
diff --git a/contrib/gce/cloud-init/node.yaml b/contrib/gce/cloud-init/node.yaml
@@ -174,6 +174,8 @@ write_files:
       WantedBy=multi-user.target
 
 runcmd:
+  # Stop the existing containerd service if there is one. (for Docker 18.09+)
+  - systemctl is-active containerd && systemctl stop containerd
   - systemctl daemon-reload
   - systemctl enable containerd-installation.service
   - systemctl enable containerd.service
@@ -186,3 +188,5 @@ runcmd:
   - systemctl enable kube-logrotate.service
   - systemctl enable kubernetes.target
   - systemctl start kubernetes.target
+  # Start docker after containerd is running. (for Docker 18.09+)
+  - systemctl is-enabled docker && (systemctl is-active docker || systemctl start docker)
