Maksytka/kind
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kind.git synced 2025-12-01 07:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1599 from BenTheElder/upgrade-containerd

Browse Source 
Upgrade containerd to 1.4-beta.0
This commit is contained in:
Kubernetes Prow Robot
2020-05-26 17:40:41 -07:00
committed by GitHub
parent 1413744360 544bf5ad0a
commit 82c4dae304
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/base/Dockerfile
View File

@@ -23,7 +23,7 @@ FROM ubuntu:20.04
# 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.3.3-14-g449e9269"
ARG CONTAINERD_VERSION="v1.4.0-beta.0-2-g6312b52d"
# Configure CNI binaries from upstream
ARG CNI_VERSION="v0.8.6"
# Configure crictl binary from upstream

2
pkg/apis/config/defaults/image.go
View File

@@ -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.18.2@sha256:7b27a6d0f2517ff88ba444025beae41491b016bc6af573ba467b70c5e8e0d85f"
const Image = "kindest/node:v1.18.2@sha256:c8f3e43281ebfac9a794f1e5a2c07c012f28c425906bcaafc2fe36c440b2d64a"

2
pkg/build/nodeimage/defaults.go
View File

@@ -20,7 +20,7 @@ package nodeimage
const DefaultImage = "kindest/node:latest"
// DefaultBaseImage is the default base image used
const DefaultBaseImage = "kindest/base:v20200513-fd490400"
const DefaultBaseImage = "kindest/base:v20200515-fefccb7a"
// DefaultMode is the default kubernetes build mode for the built image
// see pkg/build/kube.Bits