github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #832 from Random-Liu/remove-crictl-on-gce

Browse Source 
Remove crictl on GCE for all cases.
This commit is contained in:
Lantao Liu 2018-06-26 18:39:46 -07:00 committed by GitHub
commit bc99f7a7e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/gce/configure.sh
View File

@ -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})