Merge pull request kubernetes-sigs#2658 from aojea/bump_base

update base image
tnqn · Mar 6, 2022 · 0227601 · 0227601
2 parents 1e0b57b + 10ba687
commit 0227601
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -27,45 +27,45 @@ 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.9"
+ARG CONTAINERD_VERSION="1.5.10"
 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="51a2fdf8cc4f50bcd4062e2142d5ac248817e47db1406c761aa478748b27f696"
-ARG CONTAINERD_ARM64_SHA256SUM="363cc9766ed90266092799600d214d4f3c1eefa197799e42076311dc24955448"
-ARG CONTAINERD_PPC64LE_SHA256SUM="37207b653397789cc16492d5362aa7c052700c3dc9423552e07dd3b199aa1994"
-ARG CONTAINERD_S390X_SHA256SUM="ec73c6aa16e8bf213fdea6f413fbaf63cc4447915b2dce5d6cc1779bf51c9f0b"
+ARG CONTAINERD_AMD64_SHA256SUM="84c7ec4beec0e83aa02a9e1891acd6a8404675207f1e00163227fb2c82ed1e1c"
+ARG CONTAINERD_ARM64_SHA256SUM="e70d705b6063fd7facebbf6b106b4a078787da23ba6a2248b9047a5f1d0bc6d7"
+ARG CONTAINERD_PPC64LE_SHA256SUM="970fd22e9cff65a1c2ae02db1655388df12dcdebc421967d3cfd1a8932bdfdc7"
+ARG CONTAINERD_S390X_SHA256SUM="94005c30c29f24b13a977dd38283b814cc596e13dd6dde4dc289dd5c0654800e"
 
 ARG RUNC_URL="${CONTAINERD_BASE_URL}/runc.${TARGETARCH}"
-ARG RUNC_AMD64_SHA256SUM="8519c8ff8afcd9a9990d3e833a693dad999f02d88d258004236f3d7580b09bb7"
-ARG RUNC_ARM64_SHA256SUM="5662a389501c435a0e5842771a3a63972f4a0f833f05c96de5ca13b9da4a1dba"
-ARG RUNC_PPC64LE_SHA256SUM="940f0f1839b3fb5ca5aab5cfb718166a2a7fc39c0edb53ac7dfa108bc08baa3c"
-ARG RUNC_S390X_SHA256SUM="c55239f15a4062dd63584d552e56dee638d6b68df98dc849b455a6e5dd77c7fd"
+ARG RUNC_AMD64_SHA256SUM="ef912500187bb97b6f54dd0c62f563a65841aefeb666d7ff8c5ad31d04bba929"
+ARG RUNC_ARM64_SHA256SUM="d41cee612c5292c58de19c45657f5a9c8633997beeb23f84f359f77e9f9f56c6"
+ARG RUNC_PPC64LE_SHA256SUM="15c9ae3d73e56a8d64cf00bf4e1b79ce8828453e7468b6c987d53c7fed0a521f"
+ARG RUNC_S390X_SHA256SUM="c6b5aba9da2cd2325d74036be5103c266bfe261418d072d20fb2d63e2e8314b9"
 
 # Configure crictl binary from upstream
-ARG CRICTL_VERSION="v1.22.0"
+ARG CRICTL_VERSION="v1.23.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="45e0556c42616af60ebe93bf4691056338b3ea0001c0201a6a8ff8b1dbc0652a"
-ARG CRICTL_ARM64_SHA256SUM="a713c37fade0d96a989bc15ebe906e08ef5c8fe5e107c2161b0665e9963b770e"
-ARG CRICTL_PPC64LE_SHA256SUM="c78bcea20c8f8ca3be0762cca7349fd2f1df520c304d0b2ef5e8fa514f64e45f"
-ARG CRICTL_S390X_SHA256SUM="2afcf677b1c5665d0cd0f751fd5b5d7c1db6f063e007aa6b897bb5ac319611d9"
+ARG CRICTL_AMD64_SHA256SUM="b754f83c80acdc75f93aba191ff269da6be45d0fc2d3f4079704e7d1424f1ca8"
+ARG CRICTL_ARM64_SHA256SUM="91094253e77094435027998a99b9b6a67b0baad3327975365f7715a1a3bd9595"
+ARG CRICTL_PPC64LE_SHA256SUM="53db9e605a3042ea77bbf42a01a4e248dea8839bcab544c491745874f73aeee7"
+ARG CRICTL_S390X_SHA256SUM="2f9e24ec7b5aeb935f735a387257b17c62f4fb6c9cb0448d4f929a28eed0710a"
 
 # Configure CNI binaries from upstream
-ARG CNI_PLUGINS_VERSION="v1.0.1"
+ARG CNI_PLUGINS_VERSION="v1.1.0"
 ARG CNI_PLUGINS_TARBALL="${CNI_PLUGINS_VERSION}/cni-plugins-linux-${TARGETARCH}-${CNI_PLUGINS_VERSION}.tgz"
 ARG CNI_PLUGINS_URL="https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_TARBALL}"
-ARG CNI_PLUGINS_AMD64_SHA256SUM="5238fbb2767cbf6aae736ad97a7aa29167525dcd405196dfbc064672a730d3cf"
-ARG CNI_PLUGINS_ARM64_SHA256SUM="2d4528c45bdd0a8875f849a75082bc4eafe95cb61f9bcc10a6db38a031f67226"
-ARG CNI_PLUGINS_PPC64LE_SHA256SUM="f078e33067e6daaef3a3a5010d6440f2464b7973dec3ca0b5d5be22fdcb1fd96"
-ARG CNI_PLUGINS_S390X_SHA256SUM="468d33e16440d9ca4395c6bb2d5b71b35ae4a4df26301e4da85ac70c5ce56822"
+ARG CNI_PLUGINS_AMD64_SHA256SUM="05d46ac19d01669d424ee57401c0deba101763ac494858064b4ea4ffdcc37c5d"
+ARG CNI_PLUGINS_ARM64_SHA256SUM="33fc7b8d9d5be2d7f95e69e6a9e2af206879942f1e6b7615c04017dce5067f1a"
+ARG CNI_PLUGINS_PPC64LE_SHA256SUM="98239a57452e93c0a27ba9f87bcbb80c7f982f225246f3fe4f3f5ac9b6b1becb"
+ARG CNI_PLUGINS_S390X_SHA256SUM="7e902df0fd26e02bbf25d0b3499b8e696c00e1c442a9ed5f54c39dbc4c8a9b2f"
 
 # Configure containerd-fuse-overlayfs snapshotter binary from upstream
-ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.3"
+ARG CONTAINERD_FUSE_OVERLAYFS_VERSION="1.0.4"
 ARG CONTAINERD_FUSE_OVERLAYFS_TARBALL="v${CONTAINERD_FUSE_OVERLAYFS_VERSION}/containerd-fuse-overlayfs-${CONTAINERD_FUSE_OVERLAYFS_VERSION}-linux-${TARGETARCH}.tar.gz"
 ARG CONTAINERD_FUSE_OVERLAYFS_URL="https://github.com/containerd/fuse-overlayfs-snapshotter/releases/download/${CONTAINERD_FUSE_OVERLAYFS_TARBALL}"
-ARG CONTAINERD_FUSE_OVERLAYFS_AMD64_SHA256SUM="26c7af08d292f21e7067c0424479945bb9ff6315b49851511b2917179c5ae59a"
-ARG CONTAINERD_FUSE_OVERLAYFS_ARM64_SHA256SUM="68ef0896f3d5c0af73ad3d13b1b9a27f9b57cf22bdc30e36915d0f279b965bc3"
-ARG CONTAINERD_FUSE_OVERLAYFS_PPC64LE_SHA256SUM="49679827fa2b46dd28899bdc53c2926e83f42d305ad7ee31aeaf50dbb774a840"
-ARG CONTAINERD_FUSE_OVERLAYFS_S390X_SHA256SUM="ed74e26de3215a62154b47be67953a25a15e02f7a8550408fec541d6799bc7ad"
+ARG CONTAINERD_FUSE_OVERLAYFS_AMD64_SHA256SUM="228417cc97fea4df26ed85182443ee4d5799f65ada0b3ce663bf7e6bc8920f6b"
+ARG CONTAINERD_FUSE_OVERLAYFS_ARM64_SHA256SUM="5ede755ff8fe2cb3e38b59d7eb005ccc29a88037a2fa5f7749d28471ee81c727"
+ARG CONTAINERD_FUSE_OVERLAYFS_PPC64LE_SHA256SUM="cd4775b6de118bc3bc83efb89e4303c96c602b86d63f2df4a083f48e968c171d"
+ARG CONTAINERD_FUSE_OVERLAYFS_S390X_SHA256SUM="55dae4a2c74b1215ec99591b9197e6a651bfcc6f96b4cc0331537fba5411eadc"
 
 # copy in static files
 # all scripts are 0755 (rwx r-x r-x)

diff --git 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:v20220106-a11d619c"
+const DefaultBaseImage = "docker.io/kindest/base:v20220305-b67a383f"