Merge pull request #1787 from BenTheElder/containerd-release-1.4

Containerd release 1.4
kubernetes-sigs · Aug 18, 2020 · 1ebcd6f · 1ebcd6f
2 parents 6204b50 + 0f64aa1
commit 1ebcd6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -23,7 +23,7 @@ FROM ubuntu:20.10
 
 # 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="v1.4.0-rc.1-4-g43366250"
+ARG CONTAINERD_VERSION="v1.4.0"
 # Configure CNI binaries
 # TODO: switch back to upstream binaries at next release
 ARG CNI_VERSION="v0.8.6-14-g6eb8e31"

diff --git 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:v20200814-d13ba9f7"
+const DefaultBaseImage = "kindest/base:v20200817-222e7545"
 
 // DefaultMode is the default kubernetes build mode for the built image
 // see pkg/build/kube.Bits