From 8ad81b2346479107a4c34fce04be063f8fd245d6 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 17 May 2021 17:34:49 -0700 Subject: [PATCH 1/3] update containerd shasums for fixed release build --- images/base/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 017cbf371a..7718a5c64c 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -31,14 +31,14 @@ ARG TARGETARCH 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="bb3c6803e68f296b334d5ed1fa32fc25365c1b39e0c91f8dddcd53eb8b369426" -ARG CONTAINERD_ARM64_SHA256SUM="aa1251b16ca2ae57a93fd3db5dd34478740bbdf830fede625ead6b3f9cb5a4c2" -ARG CONTAINERD_PPC64LE_SHA256SUM="f9f2dd92da2760a97b1848a23653e1dd5fe202f3ccaeef26e9221f3f03c84bcf" +ARG CONTAINERD_AMD64_SHA256SUM="1852b73687fb4ee0ab25426c909c5d38f6f123281a29e657dffbf569169c6d53" +ARG CONTAINERD_ARM64_SHA256SUM="a800c384a4382feb3bbe2ea14fce2672c2c11cb64e7ba2f6a0c2b84f2d24fef7" +ARG CONTAINERD_PPC64LE_SHA256SUM="220cc93a4f5c6a4fc702bd23b5a32faa0b25cf2e754ae2b330ce325a70c67d6f" ARG RUNC_URL="${CONTAINERD_BASE_URL}/runc.${TARGETARCH}" -ARG RUNC_AMD64_SHA256SUM="60c2a09e57a29795005b0a64c4ba7d5668da4750ef24f80be61fb60e6c9aff93" -ARG RUNC_ARM64_SHA256SUM="90cc62a5ccc8f3ef20ee8209a9b0b4457daf9f91b436e23aa7fd38cccb133254" -ARG RUNC_PPC64LE_SHA256SUM="cdb2a58534c859d2bfd61c90f64c05b7c9823b2448abeca95685c59104febc71" +ARG RUNC_AMD64_SHA256SUM="b9277b5f9a8f6e5576b17d2d666ab217c7c8e2bbd34f845c42f56fd22952610c" +ARG RUNC_ARM64_SHA256SUM="b892af427845a7044dd1f3f04637bccd8e835772e5c2b952bf0eb1aba4c946b4" +ARG RUNC_PPC64LE_SHA256SUM="8e80093c39f27cd3640158e180be034687852bf38f26e21b90627288ae084a22" # Configure crictl binary from upstream ARG CRICTL_VERSION="v1.21.0" From 51cf6f7ef9527ca3817f7294d3ba21047a2e77c0 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 17 May 2021 18:06:31 -0700 Subject: [PATCH 2/3] bump base image --- pkg/build/nodeimage/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/nodeimage/defaults.go b/pkg/build/nodeimage/defaults.go index 2cb21ed477..595b4d1419 100644 --- a/pkg/build/nodeimage/defaults.go +++ b/pkg/build/nodeimage/defaults.go @@ -20,4 +20,4 @@ package nodeimage const DefaultImage = "kindest/node:latest" // DefaultBaseImage is the default base image used -const DefaultBaseImage = "docker.io/kindest/base:v20210513-60cf6961" +const DefaultBaseImage = "docker.io/kindest/base:v20210517-8ad81b23" From 3ea54cf2a67187476ecc4189e3406e0784964cab Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 17 May 2021 18:23:38 -0700 Subject: [PATCH 3/3] bump node image --- pkg/apis/config/defaults/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apis/config/defaults/image.go b/pkg/apis/config/defaults/image.go index 104ea88cdc..6833699d2b 100644 --- a/pkg/apis/config/defaults/image.go +++ b/pkg/apis/config/defaults/image.go @@ -18,4 +18,4 @@ limitations under the License. package defaults // Image is the default for the Config.Image field, aka the default node image. -const Image = "kindest/node:v1.21.1@sha256:c6eead46eaba71017e290f696fa675187133d7953e9291900e384f711b6cf8ed" +const Image = "kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad"