Skip to content

Commit 36316b0

Browse files
authored
Merge pull request #17339 from minikube-bot/auto_bump_nerdctl_version-f881b33
Kicbase/ISO: Update nerdctl from 1.5.0 to 1.6.0
2 parents ef87397 + 0bd9d64 commit 36316b0

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1 nerdctl-1.4.0-linux-arm64.tar.gz
22
sha256 1bb613049a91871614d407273e883057040e8393ef7be9508598a92b2efda4b7 nerdctl-1.5.0-linux-arm64.tar.gz
3+
sha256 d5f1ed3cda151385d313f9007afc708cae0018c9da581088b092328db154d0c6 nerdctl-1.6.0-linux-arm64.tar.gz

deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
NERDCTL_BIN_AARCH64_VERSION = 1.5.0
8-
NERDCTL_BIN_AARCH64_COMMIT = b33a58f288bc42351404a016e694190b897cd252
7+
NERDCTL_BIN_AARCH64_VERSION = 1.6.0
8+
NERDCTL_BIN_AARCH64_COMMIT = 5f39d76139344b8aac6fd03cbe0fa2fd50f89929
99
NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION)
1010
NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
1111
NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc nerdctl-1.4.0-linux-amd64.tar.gz
22
sha256 6dc945e3dfdc38e77ceafd2ec491af753366a3cf83fefccb1debaed3459829f1 nerdctl-1.5.0-linux-amd64.tar.gz
3+
sha256 fc3e7eef775eff85eb6c16b2761a574e83de444831312bc92e755a1f5577872d nerdctl-1.6.0-linux-amd64.tar.gz

deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
NERDCTL_BIN_VERSION = 1.5.0
8-
NERDCTL_BIN_COMMIT = b33a58f288bc42351404a016e694190b897cd252
7+
NERDCTL_BIN_VERSION = 1.6.0
8+
NERDCTL_BIN_COMMIT = 5f39d76139344b8aac6fd03cbe0fa2fd50f89929
99
NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION)
1010
NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz
1111
NERDCTL_BIN_STRIP_COMPONENTS = 0

deploy/kicbase/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.3"
4747
ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
4848
ARG CNI_PLUGINS_VERSION="v1.3.0"
4949
ARG TARGETARCH
50-
ARG NERDCTL_VERSION="1.5.0"
50+
ARG NERDCTL_VERSION="1.6.0"
5151
ARG NERDCTLD_VERSION="0.2.0"
5252

5353
# copy in static files (configs, scripts)

pkg/drivers/kic/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.40-1694798187-17250"
27+
Version = "v0.0.40-1696241247-17339"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "8d9a070cda8e1b1082ed355bde1aaf66fbf63d64fa6e9f553f449efc74157fe3"
30+
baseImageSHA = "77c3e98870a99538e39ecb73a5e5230b746fa8c633c297c3d287ad4bba01a880"
3131
// The name of the GCR kicbase repository
3232
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository

site/content/en/docs/commands/start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ minikube start [flags]
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s). To disable, set to 0s (default 1m0s)
2929
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
30-
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.40-1694798187-17250@sha256:8d9a070cda8e1b1082ed355bde1aaf66fbf63d64fa6e9f553f449efc74157fe3")
30+
--base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.40-1696241247-17339@sha256:77c3e98870a99538e39ecb73a5e5230b746fa8c633c297c3d287ad4bba01a880")
3131
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3232
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3333
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

0 commit comments

Comments
 (0)