From 0cec18c1177aeb0aca146d981945de44dba06a2f Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Wed, 10 Mar 2021 17:40:20 -0800 Subject: [PATCH 1/2] upgrade containerd to latest --- images/base/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index dd1fd03577..4a17d755c0 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -28,17 +28,17 @@ 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.1-31-g757be0a09" +ARG CONTAINERD_VERSION="1.5.0-beta.3-24-g95513021e" 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="2a57eddde7a7cf7b8cd71a9164fa89dddbb9a4b18d28283bad58de35f821a5ba" -ARG CONTAINERD_ARM64_SHA256SUM="45237edb38fc9768681e2bb86618b20853f5d27ce544d1004ab738fb710ba99a" -ARG CONTAINERD_PPC64LE_SHA256SUM="f54b8973bdc7b119eb4e7ac642cf7652d35954b37f97a7c1fa71f3d062badc29" +ARG CONTAINERD_AMD64_SHA256SUM="7bc2f02d661ffab596bcd3df4b1cb2d7e3b027062ccdf48db3f8fe0e155c06a1" +ARG CONTAINERD_ARM64_SHA256SUM="1fe1c4e53b9e1bb6ec44b642d8673af5d469cfc7d58d45adebb0c0f44c3dd530" +ARG CONTAINERD_PPC64LE_SHA256SUM="9b68a98a6b97feb2dac7d0f9f2ab9ad48ce2e4c4ea710b22561cd2d790ada14e" ARG RUNC_URL="${CONTAINERD_BASE_URL}/runc.${TARGETARCH}" -ARG RUNC_AMD64_SHA256SUM="7e7760a5da00a417b00f73617094e8eb130786f5dae5ea943f78390be6bb8c00" -ARG RUNC_ARM64_SHA256SUM="4fa03b63c909d6dd28562f1375e86db3742c76736cd4f22eda793c7e782999c6" -ARG RUNC_PPC64LE_SHA256SUM="a8de92a9bd6fb67c6b127809abbd59101099900ec825e275687b5158411dc8be" +ARG RUNC_AMD64_SHA256SUM="5cd388e4889c458e535ff03f7b970e212277a81057f1817f2822c3872ef3ff07" +ARG RUNC_ARM64_SHA256SUM="da114b15e17c572fff52fd23595a16ffc665c594ce4380bb677a605df9cb97a1" +ARG RUNC_PPC64LE_SHA256SUM="ed340ee7988bb2a044dda73ef2f672d246aa029fe7d903a391780c5a808986a1" # Configure crictl binary from upstream ARG CRICTL_VERSION="v1.20.0" From fd83be3fd935e1d4509c4fb46bcd644bec7a33bf Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Wed, 10 Mar 2021 17:44:45 -0800 Subject: [PATCH 2/2] update 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 b31a003414..d21f0fe24f 100644 --- a/pkg/build/nodeimage/defaults.go +++ b/pkg/build/nodeimage/defaults.go @@ -20,7 +20,7 @@ package nodeimage const DefaultImage = "kindest/node:latest" // DefaultBaseImage is the default base image used -const DefaultBaseImage = "kindest/base:v20210225-d7774569" +const DefaultBaseImage = "kindest/base:v20210310-0cec18c1" // DefaultMode is the default kubernetes build mode for the built image // see pkg/build/kube.Bits