diff --git a/images/base/Dockerfile b/images/base/Dockerfile index cf6a78e24c..dd1fd03577 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.0-69-gb3f240206" +ARG CONTAINERD_VERSION="1.5.0-beta.1-31-g757be0a09" 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="ff1df0c1cfdfe05c8d04ea909172d791b316322643cea3f37151755ef1feb8fd" -ARG CONTAINERD_ARM64_SHA256SUM="972411f483670c45db8c7d691a3135292d532db1673e71aa770f8bb85a788e68" -ARG CONTAINERD_PPC64LE_SHA256SUM="31c552a7850d7c5d086d649f0ecadf5a577e39914894473127c5954c29ce1b73" +ARG CONTAINERD_AMD64_SHA256SUM="2a57eddde7a7cf7b8cd71a9164fa89dddbb9a4b18d28283bad58de35f821a5ba" +ARG CONTAINERD_ARM64_SHA256SUM="45237edb38fc9768681e2bb86618b20853f5d27ce544d1004ab738fb710ba99a" +ARG CONTAINERD_PPC64LE_SHA256SUM="f54b8973bdc7b119eb4e7ac642cf7652d35954b37f97a7c1fa71f3d062badc29" ARG RUNC_URL="${CONTAINERD_BASE_URL}/runc.${TARGETARCH}" -ARG RUNC_AMD64_SHA256SUM="9e0ae8a11d328bc25122c28f77ffdb697fc7023c2fbaf4205f172a86d3b2102a" -ARG RUNC_ARM64_SHA256SUM="fff35c1288c0f9b6fc2f3fd07cfae4c4c93a4ddc901276380d9cdcd1b2c2db19" -ARG RUNC_PPC64LE_SHA256SUM="7678e7ff9b9900aae71d893e059cf799e5110e6e32c5f33a94a2a80fc61ac163" +ARG RUNC_AMD64_SHA256SUM="7e7760a5da00a417b00f73617094e8eb130786f5dae5ea943f78390be6bb8c00" +ARG RUNC_ARM64_SHA256SUM="4fa03b63c909d6dd28562f1375e86db3742c76736cd4f22eda793c7e782999c6" +ARG RUNC_PPC64LE_SHA256SUM="a8de92a9bd6fb67c6b127809abbd59101099900ec825e275687b5158411dc8be" # Configure crictl binary from upstream ARG CRICTL_VERSION="v1.20.0" @@ -48,12 +48,12 @@ ARG CRICTL_ARM64_SHA256SUM="eda6879710eb046d335162d4afe8494c6f8161142ad318802285 ARG CRICTL_PPC64LE_SHA256SUM="da0c052983ba884f9605b14bf627664df67fcdb41c7f6908368bf4745f889b26" # Configure CNI binaries from upstream -ARG CNI_PLUGINS_VERSION="v0.9.0" +ARG CNI_PLUGINS_VERSION="v0.9.1" 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="58a58d389895ba9f9bbd3ef330f186c0bb7484136d0bfb9b50152eed55d9ec24" -ARG CNI_PLUGINS_ARM64_SHA256SUM="49bdf1d3c852a831964aea8c9d12340b36107ee756d8328403905ff599abc6f5" -ARG CNI_PLUGINS_PPC64LE_SHA256SUM="d37829b5eeca0c941b4478203c75c6cc26d9cfc1d6c8bb451c0008e0c02a025f" +ARG CNI_PLUGINS_AMD64_SHA256SUM="962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7" +ARG CNI_PLUGINS_ARM64_SHA256SUM="ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0" +ARG CNI_PLUGINS_PPC64LE_SHA256SUM="5bd3c82ef248e5c6cc388f25545aa5a7d318778e5f9bc0a31475361bb27acefe" # copy in static files (configs, scripts) COPY files/ / diff --git a/pkg/build/nodeimage/defaults.go b/pkg/build/nodeimage/defaults.go index 291faf2677..07763643f4 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:v20210213-4187cf67" +const DefaultBaseImage = "kindest/base:v20210223-609a941a" // DefaultMode is the default kubernetes build mode for the built image // see pkg/build/kube.Bits