Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump containerd and cri-tools to latest #2207

Merged
merged 3 commits into from May 14, 2021
Merged

bump containerd and cri-tools to latest #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85b64dd
bump containerd and cri-tools to latest
MaXinjian Apr 20, 2021
60cf696
upgrade to containerd 1.5.1
BenTheElder May 14, 2021
97ff960
bump base image
BenTheElder May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions images/base/Dockerfile
View file
Open in desktop
Expand Up @@ -28,24 +28,24 @@ ARG TARGETARCH

# Configure containerd and runc binaries from kind-ci/containerd-nightlies repository
# The repository contains latest stable releases and nightlies built for multiple architectures
ARG CONTAINERD_VERSION="1.5.0-beta.4-91-g1b05b605c"
ARG CONTAINERD_VERSION="1.5.1"
ARG CONTAINERD_BASE_URL="https://github.com/kind-ci/containerd-nightlies/releases/download/containerd-${CONTAINERD_VERSION}"
ARG CONTAINERD_URL="${CONTAINERD_BASE_URL}/containerd-${CONTAINERD_VERSION}.linux-${TARGETARCH}.tar.gz"
ARG CONTAINERD_AMD64_SHA256SUM="69a52f78d2f8d63f599ac1ec6726a1156ac09f76b7d36323032e4b5bd977bc8b"
ARG CONTAINERD_ARM64_SHA256SUM="9e83ffd3e3c6dadae94e1462115e8fbe9c121357605dd903298e69eaa9f740bd"
ARG CONTAINERD_PPC64LE_SHA256SUM="3cb47b897f6df5083641a6e54f1199e5394c7aeba7a3e7dfe3368ca472e940b1"
ARG CONTAINERD_AMD64_SHA256SUM="bb3c6803e68f296b334d5ed1fa32fc25365c1b39e0c91f8dddcd53eb8b369426"
ARG CONTAINERD_ARM64_SHA256SUM="aa1251b16ca2ae57a93fd3db5dd34478740bbdf830fede625ead6b3f9cb5a4c2"
ARG CONTAINERD_PPC64LE_SHA256SUM="f9f2dd92da2760a97b1848a23653e1dd5fe202f3ccaeef26e9221f3f03c84bcf"

ARG RUNC_URL="${CONTAINERD_BASE_URL}/runc.${TARGETARCH}"
ARG RUNC_AMD64_SHA256SUM="c2ac9c6fb5d9e2c20e61d9411ebdb97edcc9d54a6836146f58ceb45a9b3b84e7"
ARG RUNC_ARM64_SHA256SUM="cffe4ae1cf6d709b84de77257fa088345ded878924e43371651b9dad1ca3617d"
ARG RUNC_PPC64LE_SHA256SUM="4a2c8848eee7ed60eb282fd2242fcbf066c7cfd285140eb3ab9871d213f7fed1"
ARG RUNC_AMD64_SHA256SUM="60c2a09e57a29795005b0a64c4ba7d5668da4750ef24f80be61fb60e6c9aff93"
ARG RUNC_ARM64_SHA256SUM="90cc62a5ccc8f3ef20ee8209a9b0b4457daf9f91b436e23aa7fd38cccb133254"
ARG RUNC_PPC64LE_SHA256SUM="cdb2a58534c859d2bfd61c90f64c05b7c9823b2448abeca95685c59104febc71"

# Configure crictl binary from upstream
ARG CRICTL_VERSION="v1.20.0"
ARG CRICTL_VERSION="v1.21.0"
ARG CRICTL_URL="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-${TARGETARCH}.tar.gz"
ARG CRICTL_AMD64_SHA256SUM="44d5f550ef3f41f9b53155906e0229ffdbee4b19452b4df540265e29572b899c"
ARG CRICTL_ARM64_SHA256SUM="eda6879710eb046d335162d4afe8494c6f8161142ad3188022852f64b92806a8"
ARG CRICTL_PPC64LE_SHA256SUM="da0c052983ba884f9605b14bf627664df67fcdb41c7f6908368bf4745f889b26"
ARG CRICTL_AMD64_SHA256SUM="85c78a35584971625bf1c3bcd46e5404a90396f979d7586f18b11119cb623e24"
ARG CRICTL_ARM64_SHA256SUM="454eecd29fe636282339af5b73c60234a7d10e4b11b9e18937e33056763d72cf"
ARG CRICTL_PPC64LE_SHA256SUM="0770100d30d430dbb67a58119ffed459856163ba01b6d71ac6fd4be7336253cf"

# Configure CNI binaries from upstream
ARG CNI_PLUGINS_VERSION="v0.9.1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/build/nodeimage/defaults.go
View file
Open in desktop
Expand Up @@ -20,4 +20,4 @@ package nodeimage
const DefaultImage = "kindest/node:latest"

// DefaultBaseImage is the default base image used
const DefaultBaseImage = "docker.io/kindest/base:v20210402-3d9112b0"
const DefaultBaseImage = "docker.io/kindest/base:v20210513-60cf6961@sha256:2b96d0b11c80e7cb1096ea89e2ffbe26ae72b2b08a177e088fa0edeff9fad516"