diff --git a/addons/containerd/1.3.7/Manifest b/addons/containerd/1.3.7/Manifest index e72a80a649..9870df126f 100644 --- a/addons/containerd/1.3.7/Manifest +++ b/addons/containerd/1.3.7/Manifest @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.3.7 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.3.7 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.3.7 yum libzstd +asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 image pause k8s.gcr.io/pause:3.1 diff --git a/addons/containerd/1.3.7/install.sh b/addons/containerd/1.3.7/install.sh index 6c43a99f44..593ff729c6 100644 --- a/addons/containerd/1.3.7/install.sh +++ b/addons/containerd/1.3.7/install.sh @@ -6,6 +6,8 @@ function containerd_install() { if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then install_host_archives "$src" install_host_packages "$src" + chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc + cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc) containerd_configure systemctl daemon-reload fi diff --git a/addons/containerd/1.3.9/Manifest b/addons/containerd/1.3.9/Manifest index 91e9acebef..785cde3c02 100644 --- a/addons/containerd/1.3.9/Manifest +++ b/addons/containerd/1.3.9/Manifest @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.3.9 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.3.9 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.3.9 yum libzstd +asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 image pause k8s.gcr.io/pause:3.1 diff --git a/addons/containerd/1.3.9/install.sh b/addons/containerd/1.3.9/install.sh index 6c43a99f44..593ff729c6 100644 --- a/addons/containerd/1.3.9/install.sh +++ b/addons/containerd/1.3.9/install.sh @@ -6,6 +6,8 @@ function containerd_install() { if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then install_host_archives "$src" install_host_packages "$src" + chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc + cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc) containerd_configure systemctl daemon-reload fi diff --git a/addons/containerd/1.4.3/Manifest b/addons/containerd/1.4.3/Manifest index 474e0ebe01..8f180c3b6f 100644 --- a/addons/containerd/1.4.3/Manifest +++ b/addons/containerd/1.4.3/Manifest @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.4.3 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.4.3 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.4.3 yum libzstd +asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 image pause k8s.gcr.io/pause:3.2 diff --git a/addons/containerd/1.4.3/install.sh b/addons/containerd/1.4.3/install.sh index 6c43a99f44..593ff729c6 100644 --- a/addons/containerd/1.4.3/install.sh +++ b/addons/containerd/1.4.3/install.sh @@ -6,6 +6,8 @@ function containerd_install() { if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then install_host_archives "$src" install_host_packages "$src" + chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc + cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc) containerd_configure systemctl daemon-reload fi diff --git a/addons/containerd/1.4.4/Manifest b/addons/containerd/1.4.4/Manifest index a12e2020ce..b8661810e7 100644 --- a/addons/containerd/1.4.4/Manifest +++ b/addons/containerd/1.4.4/Manifest @@ -4,4 +4,5 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 1.4.4 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.4.4 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.4.4 yum libzstd +asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 image pause k8s.gcr.io/pause:3.2 diff --git a/addons/containerd/1.4.4/install.sh b/addons/containerd/1.4.4/install.sh index 6c43a99f44..593ff729c6 100644 --- a/addons/containerd/1.4.4/install.sh +++ b/addons/containerd/1.4.4/install.sh @@ -6,6 +6,8 @@ function containerd_install() { if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then install_host_archives "$src" install_host_packages "$src" + chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc + cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc) containerd_configure systemctl daemon-reload fi diff --git a/addons/containerd/template/base/Manifest b/addons/containerd/template/base/Manifest index 76d87c17ca..34b19fd37e 100644 --- a/addons/containerd/template/base/Manifest +++ b/addons/containerd/template/base/Manifest @@ -4,3 +4,4 @@ dockerout ubuntu-16.04 addons/containerd/template/Dockerfile.ubuntu16 __version_ dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 __version__ dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 __version__ yum libzstd +asset runc https://github.com/opencontainers/runc/releases/download/v1.0.0-rc92/runc.amd64 diff --git a/addons/containerd/template/base/install.sh b/addons/containerd/template/base/install.sh index 6c43a99f44..593ff729c6 100644 --- a/addons/containerd/template/base/install.sh +++ b/addons/containerd/template/base/install.sh @@ -6,6 +6,8 @@ function containerd_install() { if [ "$SKIP_CONTAINERD_INSTALL" != "1" ]; then install_host_archives "$src" install_host_packages "$src" + chmod +x ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc + cp ${DIR}/addons/containerd/${CONTAINERD_VERSION}/assets/runc $(which runc) containerd_configure systemctl daemon-reload fi