diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 549052e4b4..873b44d6f5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -567,7 +567,7 @@ jobs: - name: Install container networking plugins shell: bash run: | - CNI_PLUGIN_VERSION="v1.5.1" + CNI_PLUGIN_VERSION="v1.7.1" CNI_PLUGIN_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" # change arch if not on amd64 CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e3fc26113a..4e76bf9784 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -565,7 +565,7 @@ jobs: - name: Install container networking plugins shell: bash run: | - CNI_PLUGIN_VERSION="v1.5.1" + CNI_PLUGIN_VERSION="v1.7.1" CNI_PLUGIN_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" # change arch if not on amd64 CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin" diff --git a/Makefile b/Makefile index 5a800956d9..b343fefce0 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.35.0-1747264512-20764 +ISO_VERSION ?= v1.35.0-1747341198-20771 # 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/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 c1ac917228..0c9fca9037 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 @@ -7,3 +7,4 @@ sha256 c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plu sha256 db09ab057ecf60b05ba05cbec38d55b95cc139c7f1078e2e4857cc13af158cee cni-plugins-linux-arm64-v1.6.0.tgz sha256 f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc cni-plugins-linux-arm64-v1.6.1.tgz sha256 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4 cni-plugins-linux-arm64-v1.6.2.tgz +sha256 119fcb508d1ac2149e49a550752f9cd64d023a1d70e189b59c476e4d2bf7c497 cni-plugins-linux-arm64-v1.7.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 b1c4b127e3..7075f3395f 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.6.2 +CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.7.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 bdce622795..8f33dc0b25 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 @@ -11,3 +11,4 @@ sha256 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plu sha256 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d cni-plugins-linux-amd64-v1.6.0.tgz sha256 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563 cni-plugins-linux-amd64-v1.6.1.tgz sha256 b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090 cni-plugins-linux-amd64-v1.6.2.tgz +sha256 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098 cni-plugins-linux-amd64-v1.7.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 0dbde8a4d9..6ed8864773 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.6.2 +CNI_PLUGINS_LATEST_VERSION = v1.7.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 diff --git a/hack/jenkins/installers/check_install_cni_plugins.sh b/hack/jenkins/installers/check_install_cni_plugins.sh index da5c1550b6..41e6536b27 100755 --- a/hack/jenkins/installers/check_install_cni_plugins.sh +++ b/hack/jenkins/installers/check_install_cni_plugins.sh @@ -16,7 +16,7 @@ set -eux -o pipefail -CNI_PLUGIN_VERSION="v1.2.0" +CNI_PLUGIN_VERSION="v1.7.1" CNI_PLUGIN_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin" diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index d28e082d68..ce69cd7e36 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.46-1747264594-20764" + Version = "v0.0.46-1747341282-20771" // SHA of the kic base image - baseImageSHA = "c72ae16e5f9fd49fb55f18044642d2436de7f35605322f289faffa52e7b6cf16" + baseImageSHA = "9700c7322fd333e81ca413938873a2d16f481e6b48fcba28fa96ff378022ba63" // 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 5eacc01e41..8b94e09d75 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/20764" + isoBucket := "minikube-builds/iso/20771" 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 d145a75276..c31ffd8d70 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.46-1747264594-20764@sha256:c72ae16e5f9fd49fb55f18044642d2436de7f35605322f289faffa52e7b6cf16") + --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.46-1747341282-20771@sha256:9700c7322fd333e81ca413938873a2d16f481e6b48fcba28fa96ff378022ba63") --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)