From f5803748259ad6e27bcf85170936cb3d6c689957 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Tue, 26 Jun 2018 22:37:23 +0000 Subject: [PATCH] Remove crictl on GCE for all cases. Signed-off-by: Lantao Liu --- cluster/gce/configure.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh index ea2cccf7e..eb7f4216b 100755 --- a/cluster/gce/configure.sh +++ b/cluster/gce/configure.sh @@ -133,14 +133,15 @@ else # Download and untar the release tar ball. curl -f --ipv4 -Lo "${TARBALL}" --connect-timeout 20 --max-time 300 --retry 6 --retry-delay 10 "${TARBALL_GCS_PATH}" tar xvf "${TARBALL}" - # Use crictl installed by kube-up.sh. - # TODO(random-liu): Create release tarball for GCE, and do not package crictl. - rm "${CONTAINERD_HOME}/usr/local/bin/crictl" - rm "${CONTAINERD_HOME}/etc/crictl.yaml" rm -f "${TARBALL}" fi fi +# Remove crictl shipped with containerd, use crictl installed +# by kube-up.sh. +rm -f "${CONTAINERD_HOME}/usr/local/bin/crictl" +rm -f "${CONTAINERD_HOME}/etc/crictl.yaml" + # Generate containerd config config_path="${CONTAINERD_CONFIG_PATH:-"/etc/containerd/config.toml"}" mkdir -p $(dirname ${config_path})