From 6a50db9ce1c82dc37e1f0384090a42f940071daa Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 11 Dec 2023 10:02:00 +0000 Subject: [PATCH 1/3] Kicbase/ISO: Update cni-plugins from v1.3.0 to v1.4.0 --- .../arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash | 1 + .../arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk | 2 +- .../arch/x86_64/package/cni-plugins/cni-plugins.hash | 1 + .../minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk | 2 +- deploy/kicbase/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash index ffcea791dc41..965d6b50c190 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash @@ -1,2 +1,3 @@ sha256 a7881ec37e592c897bdfd2a225b4ed74caa981e3c4cdcf8f45574f8d2f111bce cni-plugins-linux-arm64-v0.8.5.tgz sha256 de7a666fd6ad83a228086bd55756db62ef335a193d1b143d910b69f079e30598 cni-plugins-linux-arm64-v1.3.0.tgz +sha256 304d4389d5b732b7a73513d002c4895f731d030682d40653f411e10e39114194 cni-plugins-linux-arm64-v1.4.0.tgz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk index ad9ce766825d..0b4e9b0e381e 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_AARCH64_VERSION = v1.3.0 +CNI_PLUGINS_AARCH64_VERSION = v1.4.0 CNI_PLUGINS_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_AARCH64_VERSION) CNI_PLUGINS_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_AARCH64_VERSION).tgz CNI_PLUGINS_AARCH64_LICENSE = Apache-2.0 diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash index 04c0f21df57b..52e0b235dca5 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash @@ -4,3 +4,4 @@ sha256 92c7599918be0a720ac020f137cdeac746dfa03da6b26e08a37132c5728c091f v0.7.5. sha256 9d1526ed965ac6562fd95a931ab2346b3c5efd58c2f569038ba3c530f7e66472 v0.8.5.tar.gz sha256 bd682ffcf701e8f83283cdff7281aad0c83b02a56084d6e601216210732833f9 cni-plugins-linux-amd64-v0.8.5.tgz sha256 754a71ed60a4bd08726c3af705a7d55ee3df03122b12e389fdba4bea35d7dd7e cni-plugins-linux-amd64-v1.3.0.tgz +sha256 c2485ddb3ffc176578ae30ae58137f0b88e50f7c7f2af7d53a569276b2949a33 cni-plugins-linux-amd64-v1.4.0.tgz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk index c828dd386d67..08e72f7303ba 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_VERSION = v1.3.0 +CNI_PLUGINS_VERSION = v1.4.0 CNI_PLUGINS_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_VERSION) CNI_PLUGINS_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_VERSION).tgz CNI_PLUGINS_LICENSE = Apache-2.0 diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 6321da13a215..319c692032b8 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -45,7 +45,7 @@ ARG BUILDKIT_VERSION="v0.12.4" ARG CRIO_VERSION="1.24" ARG CRI_DOCKERD_VERSION="v0.3.3" ARG CRI_DOCKERD_COMMIT="b58acf8f78f9d7bce1241d1cddb0932e7101f278" -ARG CNI_PLUGINS_VERSION="v1.3.0" +ARG CNI_PLUGINS_VERSION="v1.4.0" ARG TARGETARCH ARG NERDCTL_VERSION="1.7.1" ARG NERDCTLD_VERSION="0.4.1" From d7ea269a648a9fac4c9f7ab6cb1423f496708b94 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 12 Dec 2023 15:44:07 +0000 Subject: [PATCH 2/3] Updating kicbase image to v0.0.42-1702394725-17761 --- 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 4a2ee776bf58..ed97df1fbdd9 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.42-1702334074-17764" + Version = "v0.0.42-1702394725-17761" // SHA of the kic base image - baseImageSHA = "242468f3f874ac6982f8a024f9c4a97f957667e2ee92ef27b2ae70cc267db401" + baseImageSHA = "d54bd539f5344c99d05c8897079f380df5ad03e2c1323e08060f77c1f95b4517" // 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 3b71c8562a03..f30141d63cb0 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). 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.42-1702334074-17764@sha256:242468f3f874ac6982f8a024f9c4a97f957667e2ee92ef27b2ae70cc267db401") + --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.42-1702394725-17761@sha256:d54bd539f5344c99d05c8897079f380df5ad03e2c1323e08060f77c1f95b4517") --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 4145ffc8c3ff629bd64b588eb0db70699e9f5232 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Tue, 12 Dec 2023 19:32:37 +0000 Subject: [PATCH 3/3] Updating ISO to v1.32.1-1702394653-17761 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 96744a3dc924..49d37a60cf1c 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.32.1-1701996673-17738 +ISO_VERSION ?= v1.32.1-1702394653-17761 # 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 878539bab753..a06ade5c58fb 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/17738" + isoBucket := "minikube-builds/iso/17761" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),