diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2021-10-25 13:13:56 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-25 13:17:25 -0700 |
| commit | 9262ea47a5d93d44b14f298663982b75ed2e4898 (patch) | |
| tree | a7f1c8e67d9c3180e30f309186e63a83aa099449 /tools | |
| parent | 7c267106d1d7d162d6204e6b0402d3063b1bf468 (diff) | |
Add support for containerd 1.5
"cri.runtimeoptions.v1" moved to "runtimeoptions.v1" and containerd
configuration format version 2 is required.
Updates #6449
PiperOrigin-RevId: 405474653
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/installers/containerd.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/installers/containerd.sh b/tools/installers/containerd.sh index b8da1fe42..be54f494c 100755 --- a/tools/installers/containerd.sh +++ b/tools/installers/containerd.sh @@ -19,15 +19,11 @@ set -xeo pipefail declare -r CONTAINERD_VERSION=${1:-1.3.0} declare -r CONTAINERD_MAJOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print $1; }')" declare -r CONTAINERD_MINOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print $2; }')" +declare -r CRITOOLS_VERSION=${CRITOOLS_VERSION:-1.18.0} -# We're running Go 1.16, but using pre-module containerd and cri-tools. -export GO111MODULE=off - -# Default to an older version for crictl for containerd <= 1.2. -if [[ "${CONTAINERD_MAJOR}" -eq 1 ]] && [[ "${CONTAINERD_MINOR}" -le 2 ]]; then - declare -r CRITOOLS_VERSION=${CRITOOLS_VERSION:-1.13.0} -else - declare -r CRITOOLS_VERSION=${CRITOOLS_VERSION:-1.18.0} +if [[ "${CONTAINERD_MAJOR}" -eq 1 ]] && [[ "${CONTAINERD_MINOR}" -le 4 ]]; then + # We're running Go 1.16, but using pre-module containerd and cri-tools. + export GO111MODULE=off fi # Helper for Go packages below. |