From 348b475d7b3e65c7c87130f138cf4bd448dab419 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:01:40 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update cni-plugins from v1.5.1 to v1.6.0 --- .../package/cni-plugins-latest-aarch64/cni-plugins-latest.hash | 1 + .../package/cni-plugins-latest-aarch64/cni-plugins-latest.mk | 2 +- .../x86_64/package/cni-plugins-latest/cni-plugins-latest.hash | 1 + .../x86_64/package/cni-plugins-latest/cni-plugins-latest.mk | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash index 458bda3957c8..ea7ae3eea398 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash @@ -4,3 +4,4 @@ sha256 304d4389d5b732b7a73513d002c4895f731d030682d40653f411e10e39114194 cni-plu sha256 56fe62d73942cffd8f119d2b8ecb6a062e85f529a3dbfc7aa5cd83c2c01929a7 cni-plugins-linux-arm64-v1.4.1.tgz sha256 ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plugins-linux-arm64-v1.5.0.tgz sha256 c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plugins-linux-arm64-v1.5.1.tgz +sha256 db09ab057ecf60b05ba05cbec38d55b95cc139c7f1078e2e4857cc13af158cee cni-plugins-linux-arm64-v1.6.0.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk index ea0e1690d321..f4c771c55d95 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.5.1 +CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.0 CNI_PLUGINS_LATEST_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_AARCH64_VERSION) CNI_PLUGINS_LATEST_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_LATEST_AARCH64_VERSION).tgz CNI_PLUGINS_LATEST_AARCH64_LICENSE = Apache-2.0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash index 20b9f7a1d7de..32424b54ac72 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash @@ -8,3 +8,4 @@ sha256 c2485ddb3ffc176578ae30ae58137f0b88e50f7c7f2af7d53a569276b2949a33 cni-plu sha256 2a0ea7072d1806b8526489bcd3b4847a06ab010ee32ba3c3d4e5a3235d3eb138 cni-plugins-linux-amd64-v1.4.1.tgz sha256 57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plugins-linux-amd64-v1.5.0.tgz sha256 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plugins-linux-amd64-v1.5.1.tgz +sha256 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d cni-plugins-linux-amd64-v1.6.0.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk index cf22afab230f..4eac18fb9392 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_LATEST_VERSION = v1.5.1 +CNI_PLUGINS_LATEST_VERSION = v1.6.0 CNI_PLUGINS_LATEST_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_LATEST_VERSION) CNI_PLUGINS_LATEST_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_LATEST_VERSION).tgz CNI_PLUGINS_LATEST_LICENSE = Apache-2.0 From 13886a7d1bf66fecd30c405fb6ad26eb24c57031 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 10:27:39 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.45-1730110049-19872 --- hack/kicbase_version/os-package-list.txt | 2 +- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/kicbase_version/os-package-list.txt b/hack/kicbase_version/os-package-list.txt index cf277b64114b..501c41ad8e80 100644 --- a/hack/kicbase_version/os-package-list.txt +++ b/hack/kicbase_version/os-package-list.txt @@ -22,7 +22,7 @@ ii coreutils 8.32-4.1ubuntu1.2 amd6 ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface. ii cri-o-runc 1.1.12~0 amd64 Open Container Project - runtime ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images. -ii criu 3.19-4 amd64 checkpoint and restore in userspace +ii criu 4.0-2 amd64 checkpoint and restore in userspace ii crun 100:1.2-2 amd64 OCI runtime written in C ii curl 7.81.0-1ubuntu1.18 amd64 command line tool for transferring data with URL syntax ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 2f9bb362ef37..d475918f43e4 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,10 +24,10 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.45-1729876044-19868" + Version = "v0.0.45-1730110049-19872" // SHA of the kic base image - baseImageSHA = "98fb05d9d766cf8d630ce90381e12faa07711c611be9bb2c767cfc936533477e" + baseImageSHA = "ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index e2adfc353037..c9acce01f09c 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-builds:v0.0.45-1729876044-19868@sha256:98fb05d9d766cf8d630ce90381e12faa07711c611be9bb2c767cfc936533477e") + --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.45-1730110049-19872@sha256:ead1232eaf026cb87df5e47192f652e5fef1a28f5a05a9ac9cb1a241cca351e9") --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) From d8c730041b5457cdbe5017f8cce276eb986ed9a4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 28 Oct 2024 16:02:36 +0000 Subject: [PATCH 3/3] Updating ISO to v1.34.0-1730109979-19872 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4a74f0e3cb16..e84d52e59e14 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.34.0-1729002252-19806 +ISO_VERSION ?= v1.34.0-1730109979-19872 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 9b615ff40e9c..014ac2a5b713 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-builds/iso/19806" + isoBucket := "minikube-builds/iso/19872" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),