From 9b874b59e0c83a8db74803c5fb915d6af6ab8fde Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 5 May 2021 09:19:57 -0700 Subject: [PATCH] fix: install runc rc92 --- parts/k8s/cloud-init/artifacts/cse_install.sh | 7 +++++++ parts/k8s/cloud-init/artifacts/cse_main.sh | 1 + pkg/engine/templates_generated.go | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh index d6c5de4890..87b00cec61 100755 --- a/parts/k8s/cloud-init/artifacts/cse_install.sh +++ b/parts/k8s/cloud-init/artifacts/cse_install.sh @@ -96,6 +96,13 @@ removeContainerd() { mobyPkgVersion() { dpkg -s "${1}" | grep "Version:" | awk '{ print $2 }' | cut -d '+' -f 1 } +installRunc() { + local v + v=$(runc --version | head -n 1 | cut -d" " -f3) + if [[ $v != "1.0.0-rc92" ]]; then + apt_get_install 20 30 120 moby-runc=1.0.0~rc92* --allow-downgrades || exit 27 + fi +} installMoby() { local install_pkgs="" v cli_ver="${MOBY_VERSION}" v="$(mobyPkgVersion moby-containerd)" diff --git a/parts/k8s/cloud-init/artifacts/cse_main.sh b/parts/k8s/cloud-init/artifacts/cse_main.sh index 4359044390..ca63fc6e11 100755 --- a/parts/k8s/cloud-init/artifacts/cse_main.sh +++ b/parts/k8s/cloud-init/artifacts/cse_main.sh @@ -109,6 +109,7 @@ time_metric "InstallContainerd" installContainerd {{else}} time_metric "installMoby" installMoby {{end}} +time_metric "installRunc" installRunc {{- if HasLinuxMobyURL}} LINUX_MOBY_URL={{GetLinuxMobyURL}} if [[ -n "${LINUX_MOBY_URL:-}" ]]; then diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go index 3d79380fa7..408e35b7fc 100644 --- a/pkg/engine/templates_generated.go +++ b/pkg/engine/templates_generated.go @@ -13058,6 +13058,13 @@ removeContainerd() { mobyPkgVersion() { dpkg -s "${1}" | grep "Version:" | awk '{ print $2 }' | cut -d '+' -f 1 } +installRunc() { + local v + v=$(runc --version | head -n 1 | cut -d" " -f3) + if [[ $v != "1.0.0-rc92" ]]; then + apt_get_install 20 30 120 moby-runc=1.0.0~rc92* --allow-downgrades || exit 27 + fi +} installMoby() { local install_pkgs="" v cli_ver="${MOBY_VERSION}" v="$(mobyPkgVersion moby-containerd)" @@ -13337,6 +13344,7 @@ time_metric "InstallContainerd" installContainerd {{else}} time_metric "installMoby" installMoby {{end}} +time_metric "installRunc" installRunc {{- if HasLinuxMobyURL}} LINUX_MOBY_URL={{GetLinuxMobyURL}} if [[ -n "${LINUX_MOBY_URL:-}" ]]; then