github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 08:09:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #107832 from adisky/fix-ubuntu-containerd-install

Browse Source 
[CI Job failure] Fix job containerd-e2e-ubuntu
This commit is contained in:
Kubernetes Prow Robot 2022-02-02 20:51:45 -08:00 committed by GitHub
commit 1f88942501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/gce/gci/configure.sh
View File

@ -586,19 +586,23 @@ function ensure-container-runtime {
if [[ -n "${UBUNTU_INSTALL_CONTAINERD_VERSION:-}" || -n "${UBUNTU_INSTALL_RUNC_VERSION:-}" ]]; then if [[ -n "${UBUNTU_INSTALL_CONTAINERD_VERSION:-}" || -n "${UBUNTU_INSTALL_RUNC_VERSION:-}" ]]; then
log-wrap "InstallContainerdUbuntu" install-containerd-ubuntu log-wrap "InstallContainerdUbuntu" install-containerd-ubuntu
fi fi
# when custom containerd version is installed sourcing containerd_env.sh will add all tools like ctr to the PATH
if [[ -e "/etc/profile.d/containerd_env.sh" ]]; then
log-wrap 'SourceContainerdEnv' source "/etc/profile.d/containerd_env.sh"
fi
# Verify presence and print versions of ctr, containerd, runc # Verify presence and print versions of ctr, containerd, runc
if ! command -v ctr >/dev/null 2>&1; then if ! command -v ctr >/dev/null 2>&1; then
echo "ERROR ctr not found. Aborting." echo "ERROR ctr not found. Aborting."
exit 2 exit 2
fi fi
ctr --version ctr --version
if ! command -v containerd >/dev/null 2>&1; then if ! command -v containerd >/dev/null 2>&1; then
echo "ERROR containerd not found. Aborting." echo "ERROR containerd not found. Aborting."
exit 2 exit 2
fi fi
containerd --version containerd --version
if ! command -v runc >/dev/null 2>&1; then if ! command -v runc >/dev/null 2>&1; then
echo "ERROR runc not found. Aborting." echo "ERROR runc not found. Aborting."
exit 2 exit 2