From ade85e643ebafa89fd1d7c0d946239557ab07d49 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 11 Mar 2019 00:45:09 -0700 Subject: [PATCH] Support docker 18.09 in the test script. Signed-off-by: Lantao Liu --- cluster/gce/cloud-init/master.yaml | 4 ++++ cluster/gce/cloud-init/node.yaml | 4 ++++ test/e2e_node/init.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/cluster/gce/cloud-init/master.yaml b/cluster/gce/cloud-init/master.yaml index 2d7e5bfcb..5b16128d7 100644 --- 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 index ab7b17c1d..b92dcbb30 100644 --- 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 index 07a461e00..8608ee5ef 100644 --- 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)