diff --git a/.github/workflows/functional_test.yml b/.github/workflows/functional_test.yml index f006e375e82a..e8f2dcadc12f 100644 --- a/.github/workflows/functional_test.yml +++ b/.github/workflows/functional_test.yml @@ -305,7 +305,7 @@ jobs: shell: bash if: matrix.driver == 'none' run: | - CNI_PLUGIN_VERSION="v1.7.1" + CNI_PLUGIN_VERSION="v1.8.0" CNI_PLUGIN_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin" curl -LO "https://github.com/containernetworking/plugins/releases/download/$CNI_PLUGIN_VERSION/$CNI_PLUGIN_TAR" diff --git a/Makefile b/Makefile index 434f3fa13135..b5b1488c1d54 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.37.0-1763503576-21924 +ISO_VERSION ?= v1.37.0-1763935228-21975 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 92910d5d4baa..cd560acdb311 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -46,7 +46,7 @@ ARG CRIO_VERSION="v1.34" ARG CRICTL_VERSION="v1.34.0" ARG CRI_DOCKERD_VERSION="v0.4.1" ARG CRI_DOCKERD_COMMIT="55d6e1a1d6f2ee58949e13a0c66afe7d779ac942" -ARG CNI_PLUGINS_VERSION="v1.4.0" +ARG CNI_PLUGINS_VERSION="v1.8.0" ARG TARGETARCH ARG NERDCTL_VERSION="1.7.7" ARG NERDCTLD_VERSION="0.7.0" diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index e88aa6c23fa1..b2f060f8b078 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.48-1763789673-21948" + Version = "v0.0.48-1763935653-21975" // SHA of the kic base image - baseImageSHA = "bb10ebd3ca086eea12c038085866fb2f6cfa67385dcb830c4deb5e36ced6b53f" + baseImageSHA = "5273d148037cfb860f8152fbd08072e6c1f4b37ff9a51956a3c12965f5f2d787" // 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 77f5b22bdb24..e5cb32fe914e 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/21924" + isoBucket := "minikube-builds/iso/21975" 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 22bf7e4ba105..4987e1142838 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.48-1763789673-21948@sha256:bb10ebd3ca086eea12c038085866fb2f6cfa67385dcb830c4deb5e36ced6b53f") + --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.48-1763935653-21975@sha256:5273d148037cfb860f8152fbd08072e6c1f4b37ff9a51956a3c12965f5f2d787") --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)