diff --git a/Makefile b/Makefile index 812bb081dc4f..959a04cca0c9 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-1701387192-17703 +ISO_VERSION ?= v1.32.1-1701804884-17732 # 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/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash index dd7dad9549c7..083137bcf152 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash @@ -5,3 +5,4 @@ sha256 252408105ef1c2256980a105f727912603a831d6c57d3243b5d4cbb25fafb1b1 buildki sha256 82b7452ffea166d3ef445597f9dbe3fa57c4d651e51ca7a9a581199116905524 buildkit-v0.11.6.linux-arm64.tar.gz sha256 78846e12435f00e0ee5b9ca0af28ec78691fa712ebe7d2c799ec8a074c791969 buildkit-v0.12.2.linux-arm64.tar.gz sha256 a6809c7983834f5a4dd3a92a421a9ff9a306e774ce2866d53636e8d5a3f2e82b buildkit-v0.12.3.linux-arm64.tar.gz +sha256 9166eeaff11721122b9398d6385c7b73d6e4df86797e537c16ac6b6d05eab899 buildkit-v0.12.4.linux-arm64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk index 2f290a0ff4d4..cf25ca676aec 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_AARCH64_VERSION = v0.12.3 -BUILDKIT_BIN_AARCH64_COMMIT = 438f47256f0decd64cc96084e22d3357da494c27 +BUILDKIT_BIN_AARCH64_VERSION = v0.12.4 +BUILDKIT_BIN_AARCH64_COMMIT = 833949d0f7908608b00ab6b93b8f92bdb147fcca BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION) BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz 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/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash index 4c598a524bd1..34368016584b 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash @@ -29,3 +29,4 @@ sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.t sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz +sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk index bd57eef4fa74..52945de74241 100644 --- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_AARCH64_VERSION = v1.7.9 -CONTAINERD_BIN_AARCH64_COMMIT = 4f03e100cb967922bec7459a78d16ccbac9bb81d +CONTAINERD_BIN_AARCH64_VERSION = v1.7.10 +CONTAINERD_BIN_AARCH64_COMMIT = 4e1fe7492b9df85914c389d1f15a3ceedbb280ac CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash index 288f1b3c531d..5ca93e7a28fc 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash @@ -9,3 +9,4 @@ sha256 6de87c88b1da0b1e899371dd4c0b883581401e2ddfb21a065510eeb3a8ac8743 buildki sha256 3f66f5bfbe509aadf1c21a26acfa472fe4c19046aa00a2d59b99733da867cd76 buildkit-v0.11.6.linux-amd64.tar.gz sha256 c856bb4e6584d75ca6b2a7b6e946b7b14628e82bf1eccb4a43bc731bbc8e67ea buildkit-v0.12.2.linux-amd64.tar.gz sha256 01682ab9e8e7cada519396b5f7b72c964c0c30da0c2eb7ee46caf30622717fa1 buildkit-v0.12.3.linux-amd64.tar.gz +sha256 75ffe406e4284b77af35447d829767cfa935eb7dd2ea2e3407223d6885bd8ebd buildkit-v0.12.4.linux-amd64.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk index de4de3a5ecd3..12d070a657ca 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -BUILDKIT_BIN_VERSION = v0.12.3 -BUILDKIT_BIN_COMMIT = 438f47256f0decd64cc96084e22d3357da494c27 +BUILDKIT_BIN_VERSION = v0.12.4 +BUILDKIT_BIN_COMMIT = 833949d0f7908608b00ab6b93b8f92bdb147fcca BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION) BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz 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/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash index 4c598a524bd1..34368016584b 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash @@ -29,3 +29,4 @@ sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.t sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz +sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk index c3e9ae81c0a9..41dffff549b0 100644 --- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk @@ -3,8 +3,8 @@ # containerd # ################################################################################ -CONTAINERD_BIN_VERSION = v1.7.9 -CONTAINERD_BIN_COMMIT = 4f03e100cb967922bec7459a78d16ccbac9bb81d +CONTAINERD_BIN_VERSION = v1.7.10 +CONTAINERD_BIN_COMMIT = 4e1fe7492b9df85914c389d1f15a3ceedbb280ac CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index ce4cb9aa5144..587ad7edea8c 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -19,7 +19,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:jammy-* -ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20231004" +ARG UBUNTU_JAMMY_IMAGE="ubuntu:jammy-20231128" # multi-stage docker build so we can build auto-pause for arm64 FROM golang:1.21.4 as auto-pause WORKDIR /src @@ -41,11 +41,11 @@ RUN if [ "$PREBUILT_AUTO_PAUSE" != "true" ]; then cd ./cmd/auto-pause/ && go bui # for a kubernetes node image, it doesn't contain much we don't need FROM ${UBUNTU_JAMMY_IMAGE} as kicbase -ARG BUILDKIT_VERSION="v0.12.3" +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.2.0" diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index f3bc6c7c0745..db6193d097f4 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-1701387262-17703" + Version = "v0.0.42-1701804889-17732" // SHA of the kic base image - baseImageSHA = "a5458414df1be5e58eff93b3e67e6ecaad7e51ab23139de15714f7345af15e2f" + baseImageSHA = "d474fca8cddaa0e31ba696aede3e97a0d9a0cb76d73352e0b606b6c5ca67f44d" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 60e2f64d3c35..e49c35b95237 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/17703" + isoBucket := "minikube-builds/iso/17732" 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 a58f7ac4887b..76227811a978 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-1701387262-17703@sha256:a5458414df1be5e58eff93b3e67e6ecaad7e51ab23139de15714f7345af15e2f") + --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-1701804889-17732@sha256:d474fca8cddaa0e31ba696aede3e97a0d9a0cb76d73352e0b606b6c5ca67f44d") --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)