diff --git a/Makefile b/Makefile index fe015e5307e3..cb641e718a27 100644 --- a/Makefile +++ b/Makefile @@ -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.35.0 +ISO_VERSION ?= v1.35.0-1737454509-20300 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash index 5e7c678e73b4..6023f3f73a45 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.hash +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.hash @@ -26,3 +26,4 @@ sha256 789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25 v1.1.13. sha256 563cf57c38d2e7149234dbe6f63ca0751eb55ef8f586ed12a543dedc1aceba68 v1.1.14.tar.gz sha256 8446718a107f3e437bc33a4c9b89b94cb24ae58ed0a49d08cd83ac7d39980860 v1.1.15.tar.gz sha256 b12ba86441c259225374640db1cbf915168a04d94e471ec936684df2f05423a0 v1.2.3.tar.gz +sha256 9785c144c97974b52b6091b7a79168b73681ff574bc8438b44f3f5f8c112f171 v1.2.4.tar.gz diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk index 39138f8d833f..7786b700f190 100644 --- a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk +++ b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk @@ -4,8 +4,8 @@ # ################################################################################ -RUNC_MASTER_VERSION = v1.2.3 -RUNC_MASTER_COMMIT = 0d37cfd4b557771e555a184d5a78d0ed4bdb79a5 +RUNC_MASTER_VERSION = v1.2.4 +RUNC_MASTER_COMMIT = 6c52b3fc541fb26fe8c374d5f58112a0a5dbda66 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz RUNC_MASTER_LICENSE = Apache-2.0 diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index 240f2f66a2df..0260e0a33136 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -16,7 +16,7 @@ ii ca-certificates 20240203~22.04.1 all ii catatonit 0.1.7-1 amd64 init process for containers ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables -ii containerd.io 1.7.24-1 amd64 An open and reliable container runtime +ii containerd.io 1.7.25-1 amd64 An open and reliable container runtime ii containernetworking-plugins 0.9.1+ds1-1ubuntu0.1 amd64 standard networking plugins - binaries ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. @@ -32,8 +32,8 @@ ii diffutils 1:3.8-0ubuntu2 amd6 ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service ii dnsutils 1:9.18.30-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils ii docker-buildx-plugin 0.19.3-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin. -ii docker-ce 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine -ii docker-ce-cli 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine +ii docker-ce 5:27.5.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine +ii docker-ce-cli 5:27.5.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration @@ -152,8 +152,8 @@ ii libprotobuf-c1:amd64 1.3.3-1ubuntu2.1 amd6 ii libprotobuf23:amd64 3.12.4-1ubuntu7.22.04.1 amd64 protocol buffers C++ library ii libpsl5:amd64 0.21.0-1.2build2 amd64 Library for Public Suffix List (shared libraries) ii libpython3-stdlib:amd64 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version) -ii libpython3.10-minimal:amd64 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10) -ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (standard library, version 3.10) +ii libpython3.10-minimal:amd64 3.10.12-1~22.04.8 amd64 Minimal subset of the Python language (version 3.10) +ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.8 amd64 Interactive high-level object-oriented language (standard library, version 3.10) ii libreadline8:amd64 8.1.2-1 amd64 GNU readline and history libraries, run-time libraries ii librtmp1:amd64 2.4+20151223.gitfa8646d.1-2build4 amd64 toolkit for RTMP streams (shared library) ii libsasl2-2:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - authentication abstraction library @@ -213,11 +213,11 @@ ii python3-minimal 3.10.6-1~22.04.1 amd6 ii python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.2 all Package Discovery and Resource Access using pkg_resources ii python3-protobuf 3.12.4-1ubuntu7.22.04.1 amd64 Python 3 bindings for protocol buffers ii python3-six 1.16.0-3ubuntu1 all Python 2 and 3 compatibility library (Python 3 interface) -ii python3.10 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (version 3.10) -ii python3.10-minimal 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10) +ii python3.10 3.10.12-1~22.04.8 amd64 Interactive high-level object-oriented language (version 3.10) +ii python3.10-minimal 3.10.12-1~22.04.8 amd64 Minimal subset of the Python language (version 3.10) ii readline-common 8.1.2-1 all GNU readline and history libraries, common files ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses -ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool +ii rsync 3.2.7-0ubuntu0.22.04.4 amd64 fast, versatile, remote (and local) file-copying tool ii sed 4.8-1ubuntu2 amd64 GNU stream editor for filtering/transforming text ii sensible-utils 0.0.17 all Utilities for sensible alternative selection ii socat 1.7.4.1-3ubuntu4 amd64 multipurpose relay for bidirectional data transfer diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 740300ebabc7..ddbda9198f64 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,14 +24,14 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.46" + Version = "v0.0.46-1737454587-20300" // SHA of the kic base image - baseImageSHA = "fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279" + baseImageSHA = "a10f0845be544807752fadcf3da03733cf662d366fbe1759c4887c0d717ed57c" // The name of the GCR kicbase repository - gcrRepo = "gcr.io/k8s-minikube/kicbase" + gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository - dockerhubRepo = "docker.io/kicbase/stable" + dockerhubRepo = "docker.io/kicbase/build" ) var ( diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 2e86d3865c59..caaa3821c1f8 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -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/iso" + isoBucket := "minikube-builds/iso/20300" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 22fc9815a397..20368d6c2dcc 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -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:v0.0.46@sha256:fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279") + --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.46-1737454587-20300@sha256:a10f0845be544807752fadcf3da03733cf662d366fbe1759c4887c0d717ed57c") --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)