From 01d7c6346d5a38376d472a4ea7b3d53b8ff269d4 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 24 Jun 2024 15:06:13 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update cni-plugins from v1.5.0 to v1.5.1 --- .../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 5d9144531558..458bda3957c8 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 @@ -3,3 +3,4 @@ sha256 de7a666fd6ad83a228086bd55756db62ef335a193d1b143d910b69f079e30598 cni-plu sha256 304d4389d5b732b7a73513d002c4895f731d030682d40653f411e10e39114194 cni-plugins-linux-arm64-v1.4.0.tgz 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 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 18f20425230e..ea0e1690d321 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.0 +CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.5.1 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 75ef2e6ba22d..20b9f7a1d7de 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 @@ -7,3 +7,4 @@ sha256 754a71ed60a4bd08726c3af705a7d55ee3df03122b12e389fdba4bea35d7dd7e cni-plu sha256 c2485ddb3ffc176578ae30ae58137f0b88e50f7c7f2af7d53a569276b2949a33 cni-plugins-linux-amd64-v1.4.0.tgz 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 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 fa100fb43cf6..cf22afab230f 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.0 +CNI_PLUGINS_LATEST_VERSION = v1.5.1 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 91b40a7668dae07819d4a1be0892acaea98cb473 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 24 Jun 2024 16:30:29 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.44-1719245474-19128 --- pkg/drivers/kic/types.go | 4 ++-- site/content/en/docs/commands/start.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 147447d2522d..5c53a45c4222 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.44-1719002606-19116" + Version = "v0.0.44-1719245474-19128" // SHA of the kic base image - baseImageSHA = "ec7dcf8d3844a2a395c2631e7cc3300acd47f1b5484b2bfb860088acc3edb26e" + baseImageSHA = "bbc3efa956ea8111b9efadfdfeff422d4c4d743a7756ec7b74c70abade56ceb8" // 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 8034794d9d91..f2384de49dc0 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.44-1719002606-19116@sha256:ec7dcf8d3844a2a395c2631e7cc3300acd47f1b5484b2bfb860088acc3edb26e") + --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.44-1719245474-19128@sha256:bbc3efa956ea8111b9efadfdfeff422d4c4d743a7756ec7b74c70abade56ceb8") --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 41623ece558473adce14b68ca67ade23eff6d1a3 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 24 Jun 2024 21:56:45 +0000 Subject: [PATCH 3/3] Updating ISO to v1.33.1-1719245461-19128 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c9ba23c899b0..5cef6b92831a 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.33.1-1719002529-19116 +ISO_VERSION ?= v1.33.1-1719245461-19128 # 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 7dd64de3355d..767f3be7539d 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/19116" + isoBucket := "minikube-builds/iso/19128" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),