Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kicbase/ISO: Update nerdctl from 1.5.0 to 1.6.0 #17339

Merged
merged 2 commits into from
Oct 3, 2023
Merged

Kicbase/ISO: Update nerdctl from 1.5.0 to 1.6.0 #17339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
014884f
Kicbase/ISO: Update nerdctl from 1.5.0 to 1.6.0
minikube-bot Oct 2, 2023
0bd9d64
Updating kicbase image to v0.0.40-1696241247-17339
minikube-bot Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
sha256 0edb064a7d68d0425152ed59472ce7566700b4e547afb300481498d4c7fc6cf1 nerdctl-1.4.0-linux-arm64.tar.gz
sha256 1bb613049a91871614d407273e883057040e8393ef7be9508598a92b2efda4b7 nerdctl-1.5.0-linux-arm64.tar.gz
sha256 d5f1ed3cda151385d313f9007afc708cae0018c9da581088b092328db154d0c6 nerdctl-1.6.0-linux-arm64.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/aarch64/package/nerdctl-bin-aarch64/nerdctl-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_AARCH64_VERSION = 1.5.0
NERDCTL_BIN_AARCH64_COMMIT = b33a58f288bc42351404a016e694190b897cd252
NERDCTL_BIN_AARCH64_VERSION = 1.6.0
NERDCTL_BIN_AARCH64_COMMIT = 5f39d76139344b8aac6fd03cbe0fa2fd50f89929
NERDCTL_BIN_AARCH64_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_AARCH64_VERSION)
NERDCTL_BIN_AARCH64_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
NERDCTL_BIN_AARCH64_STRIP_COMPONENTS = 0
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
sha256 d8dcd4e270ae76ab294be3a451a2d8299010e69dce6ae559bc3193535610e4cc nerdctl-1.4.0-linux-amd64.tar.gz
sha256 6dc945e3dfdc38e77ceafd2ec491af753366a3cf83fefccb1debaed3459829f1 nerdctl-1.5.0-linux-amd64.tar.gz
sha256 fc3e7eef775eff85eb6c16b2761a574e83de444831312bc92e755a1f5577872d nerdctl-1.6.0-linux-amd64.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/x86_64/package/nerdctl-bin/nerdctl-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_VERSION = 1.5.0
NERDCTL_BIN_COMMIT = b33a58f288bc42351404a016e694190b897cd252
NERDCTL_BIN_VERSION = 1.6.0
NERDCTL_BIN_COMMIT = 5f39d76139344b8aac6fd03cbe0fa2fd50f89929
NERDCTL_BIN_SITE = https://github.com/containerd/nerdctl/releases/download/v$(NERDCTL_BIN_VERSION)
NERDCTL_BIN_SOURCE = nerdctl-$(NERDCTL_BIN_AARCH64_VERSION)-linux-amd64.tar.gz
NERDCTL_BIN_STRIP_COMPONENTS = 0
Expand Down
2 changes: 1 addition & 1 deletion deploy/kicbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ARG CRI_DOCKERD_VERSION="v0.3.3"
ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278"
ARG CNI_PLUGINS_VERSION="v1.3.0"
ARG TARGETARCH
ARG NERDCTL_VERSION="1.5.0"
ARG NERDCTL_VERSION="1.6.0"
ARG NERDCTLD_VERSION="0.2.0"

# copy in static files (configs, scripts)
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

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

// SHA of the kic base image
baseImageSHA = "8d9a070cda8e1b1082ed355bde1aaf66fbf63d64fa6e9f553f449efc74157fe3"
baseImageSHA = "77c3e98870a99538e39ecb73a5e5230b746fa8c633c297c3d287ad4bba01a880"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ minikube start [flags]
--apiserver-port int The apiserver listening port (default 8443)
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s). To disable, set to 0s (default 1m0s)
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
--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")
--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")
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)
Expand Down
Loading