Merge pull request #1097 from Random-Liu/cherrypick-#1083-release-1.2

Random-Liu · web-flow · commit 4bfcd93a4beb · 2019-03-22T17:32:03.000-07:00
Support docker 18.09 in the test script.
diff --git a/cluster/gce/cloud-init/master.yaml b/cluster/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/cluster/gce/cloud-init/node.yaml b/cluster/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)
diff --git a/test/e2e_node/init.yaml b/test/e2e_node/init.yaml
@@ -61,8 +61,12 @@ 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
   - systemctl enable containerd.target
   - systemctl start containerd.target
+  # Start docker after containerd is running. (for Docker 18.09+)
+  - systemctl is-enabled docker && (systemctl is-active docker || systemctl start docker)
