Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)

# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.37.0-1758198818-20370
ISO_VERSION ?= v1.37.0-1759776077-21704

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sha256 d8df47708ca57b9cd7f498055126ba7dcfc811d9ba43aae1830c93a09e70e22d nerdctl
sha256 a53d87fc7d1f4ffeec55e5e08d2397b02ada0d334874c3cece306ad36f828a6c nerdctl-1.7.5-linux-arm64.tar.gz
sha256 4fa0a6e936c7a9cb9bb81e784fddaa593cb00afb48b08842e3f0503748c21348 nerdctl-1.7.6-linux-arm64.tar.gz
sha256 230ad8f4f88100774d123213a427d3d43071e0dcf9f70efbea50ab9efff1cd4c nerdctl-1.7.7-linux-arm64.tar.gz
sha256 5c30be3ec118eb222bf635f8049c2f96b4c46d9343ec445058e9bc2ee9531c28 nerdctl-2.1.6-linux-arm64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_AARCH64_VERSION = 1.7.7
NERDCTL_BIN_AARCH64_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
NERDCTL_BIN_AARCH64_VERSION = 2.1.6
NERDCTL_BIN_AARCH64_COMMIT = 59253e9931873e79b92fe3400f14e69d6be34025
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ sha256 71aee9d987b7fad0ff2ade50b038ad7e2356324edc02c54045960a3521b3e6a7 nerdctl
sha256 775f8bddd5e93acc4162c568dd6b84d5925549180991b83cfd4b7e33d4844921 nerdctl-1.7.5-linux-amd64.tar.gz
sha256 0326d6a42dbec5c104ed9d7aa8cbc62727433dbe000cf21cc29d06b22507e0f0 nerdctl-1.7.6-linux-amd64.tar.gz
sha256 298bb95aee485b24d566115ef7e4e90951dd232447b05de5646a652a23db70a9 nerdctl-1.7.7-linux-amd64.tar.gz
sha256 22857b373edea479a4534ba62cae1c77f2af38f0aac4c91c1c68cf09e29d6f9e nerdctl-2.1.6-linux-amd64.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

NERDCTL_BIN_VERSION = 1.7.7
NERDCTL_BIN_COMMIT = 5882c720f4e7f358fb26b759e514b3ae9dd8ea83
NERDCTL_BIN_VERSION = 2.1.6
NERDCTL_BIN_COMMIT = 59253e9931873e79b92fe3400f14e69d6be34025
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ARG CRI_DOCKERD_VERSION="v0.4.0"
ARG CRI_DOCKERD_COMMIT="b9b889355f3002c01db294427964e454dfbc3feb"
ARG CNI_PLUGINS_VERSION="v1.4.0"
ARG TARGETARCH
ARG NERDCTL_VERSION="1.7.7"
ARG NERDCTL_VERSION="2.1.6"
ARG NERDCTLD_VERSION="0.6.1"

# copy in static files (configs, scripts)
Expand Down
6 changes: 3 additions & 3 deletions hack/kicbase_version/os-package-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ ii diffutils 1:3.8-4 amd64
ii dirmngr 2.2.40-1.1+deb12u1 amd64 GNU privacy guard - network certificate management service
ii dmsetup 2:1.02.185-2 amd64 Linux Kernel Device Mapper userspace library
ii dnsutils 1:9.18.33-1~deb12u2 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.29.0-0~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit.
ii docker-ce 5:28.4.0-1~debian.12~bookworm amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:28.4.0-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
ii docker-buildx-plugin 0.29.1-1~debian.12~bookworm amd64 Docker Buildx plugin extends build capabilities with BuildKit.
ii docker-ce 5:28.5.0-1~debian.12~bookworm amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:28.5.0-1~debian.12~bookworm amd64 Docker CLI: the open-source application container engine
ii dpkg 1.21.22 amd64 Debian package management system
ii e2fsprogs 1.47.0-2+b2 amd64 ext2/ext3/ext4 file system utilities
ii ebtables 2.0.11-5 amd64 Ethernet bridge frame table administration
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
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.48-1759382731-21643"
Version = "v0.0.48-1759749079-21704"

// SHA of the kic base image
baseImageSHA = "ca1b4db171879edd6bbb9546a4b1afac2eb5be94a0f5528496e62d2ff99de37d"
baseImageSHA = "4f0e9463cc7d929ac439484b6e1a258218b09f160ed5aa68a96ea20061693287"
// 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 pkg/minikube/download/iso.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const fileScheme = "file"
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
func DefaultISOURLs() []string {
v := version.GetISOVersion()
isoBucket := "minikube-builds/iso/20370"
isoBucket := "minikube-builds/iso/21704"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
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) (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.48-1759382731-21643@sha256:ca1b4db171879edd6bbb9546a4b1afac2eb5be94a0f5528496e62d2ff99de37d")
--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.48-1759749079-21704@sha256:4f0e9463cc7d929ac439484b6e1a258218b09f160ed5aa68a96ea20061693287")
--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