kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Kicbase/ISO: Update cni-plugins from v1.6.2 to v1.7.1 (#20771) 

* Kicbase/ISO: Update cni-plugins from v1.6.2 to v1.7.1

* Updating kicbase image to v0.0.46-1747341282-20771

* Updating ISO to v1.35.0-1747341198-20771
pull/20774/head
minikube-bot 2025-05-16 11:31:38 -07:00 committed by GitHub
parent 07bc913794
commit 9171dbbc18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/master.yml vendored
View File

@ -567,7 +567,7 @@ jobs:
- name: Install container networking plugins - name: Install container networking plugins
shell: bash shell: bash
run: | 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_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" # change arch if not on amd64
CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin" CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin"

2
.github/workflows/pr.yml vendored
View File

@ -565,7 +565,7 @@ jobs:
- name: Install container networking plugins - name: Install container networking plugins
shell: bash shell: bash
run: | 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_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz" # change arch if not on amd64
CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin" CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin"

2
Makefile
View File

@ -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) 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 # 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 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

1
deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash
View File

@ -7,3 +7,4 @@ sha256 c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plu
sha256 db09ab057ecf60b05ba05cbec38d55b95cc139c7f1078e2e4857cc13af158cee cni-plugins-linux-arm64-v1.6.0.tgz sha256 db09ab057ecf60b05ba05cbec38d55b95cc139c7f1078e2e4857cc13af158cee cni-plugins-linux-arm64-v1.6.0.tgz
sha256 f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc cni-plugins-linux-arm64-v1.6.1.tgz sha256 f0f440b968ab50ad13d9d42d993ba98ec30b2ec666846f4ef1bddc7646a701cc cni-plugins-linux-arm64-v1.6.1.tgz
sha256 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4 cni-plugins-linux-arm64-v1.6.2.tgz sha256 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4 cni-plugins-linux-arm64-v1.6.2.tgz
sha256 119fcb508d1ac2149e49a550752f9cd64d023a1d70e189b59c476e4d2bf7c497 cni-plugins-linux-arm64-v1.7.1.tgz

2
deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk
View File

@ -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_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_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_LATEST_AARCH64_VERSION).tgz
CNI_PLUGINS_LATEST_AARCH64_LICENSE = Apache-2.0 CNI_PLUGINS_LATEST_AARCH64_LICENSE = Apache-2.0

1
deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash
View File

@ -11,3 +11,4 @@ sha256 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plu
sha256 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d cni-plugins-linux-amd64-v1.6.0.tgz sha256 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d cni-plugins-linux-amd64-v1.6.0.tgz
sha256 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563 cni-plugins-linux-amd64-v1.6.1.tgz sha256 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563 cni-plugins-linux-amd64-v1.6.1.tgz
sha256 b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090 cni-plugins-linux-amd64-v1.6.2.tgz sha256 b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090 cni-plugins-linux-amd64-v1.6.2.tgz
sha256 1a28a0506bfe5bcdc981caf1a49eeab7e72da8321f1119b7be85f22621013098 cni-plugins-linux-amd64-v1.7.1.tgz

2
deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk
View File

@ -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_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_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_LATEST_VERSION).tgz
CNI_PLUGINS_LATEST_LICENSE = Apache-2.0 CNI_PLUGINS_LATEST_LICENSE = Apache-2.0

2
hack/jenkins/installers/check_install_cni_plugins.sh
View File

@ -16,7 +16,7 @@
set -eux -o pipefail 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_TAR="cni-plugins-linux-amd64-$CNI_PLUGIN_VERSION.tgz"
CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin" CNI_PLUGIN_INSTALL_DIR="/opt/cni/bin"

4
pkg/drivers/kic/types.go
View File

@ -24,10 +24,10 @@ import (
const ( const (
// Version is the current version of kic // 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 // SHA of the kic base image
baseImageSHA = "c72ae16e5f9fd49fb55f18044642d2436de7f35605322f289faffa52e7b6cf16" baseImageSHA = "9700c7322fd333e81ca413938873a2d16f481e6b48fcba28fa96ff378022ba63"
// The name of the GCR kicbase repository // The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository // The name of the Dockerhub kicbase repository

2
pkg/minikube/download/iso.go
View File

@ -41,7 +41,7 @@ const fileScheme = "file"
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
func DefaultISOURLs() []string { func DefaultISOURLs() []string {
v := version.GetISOVersion() v := version.GetISOVersion()
isoBucket := "minikube-builds/iso/20764" isoBucket := "minikube-builds/iso/20771"
return []string{ return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

2
site/content/en/docs/commands/start.md
View File

@ -27,7 +27,7 @@ minikube start [flags]
--apiserver-port int The apiserver listening port (default 8443) --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-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) --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. --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) --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) --cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)