Skip to content

Commit

Permalink
Kicbase/ISO: Update cni-plugins from v1.6.1 to v1.6.2 (#20236)
Browse files Browse the repository at this point in the history 
* Kicbase/ISO: Update cni-plugins from v1.6.1 to v1.6.2

* Updating kicbase image to v0.0.45-1736763277-20236

* Updating ISO to v1.34.0-1736762773-20236
  • Loading branch information
@minikube-bot
minikube-bot authored Jan 13, 2025
1 parent 03d4a5a commit cbd4945
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.34.0-1734029574-20090
ISO_VERSION ?= v1.34.0-1736762773-20236

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
1 change: 1 addition & 0 deletions .../iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.hash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ sha256 ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plu
sha256 c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plugins-linux-arm64-v1.5.1.tgz
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
2 changes: 1 addition & 1 deletion ...oy/iso/minikube-iso/arch/aarch64/package/cni-plugins-latest-aarch64/cni-plugins-latest.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.1
CNI_PLUGINS_LATEST_AARCH64_VERSION = v1.6.2
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
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.hash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ sha256 57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plu
sha256 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plugins-linux-amd64-v1.5.1.tgz
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
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins-latest/cni-plugins-latest.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

CNI_PLUGINS_LATEST_VERSION = v1.6.1
CNI_PLUGINS_LATEST_VERSION = v1.6.2
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
Expand Down
18 changes: 9 additions & 9 deletions hack/kicbase_version/os-package-list.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ ii apt 2.4.13 amd6
ii base-files 12ubuntu4.7 amd64 Debian base system miscellaneous files
ii base-passwd 3.5.52build1 amd64 Debian base system master password and group files
ii bash 5.1-6ubuntu1.1 amd64 GNU Bourne Again SHell
ii bind9-dnsutils 1:9.18.28-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9
ii bind9-host 1:9.18.28-0ubuntu0.22.04.1 amd64 DNS Lookup Utility
ii bind9-libs:amd64 1:9.18.28-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9
ii bind9-dnsutils 1:9.18.30-0ubuntu0.22.04.1 amd64 Clients provided with BIND 9
ii bind9-host 1:9.18.30-0ubuntu0.22.04.1 amd64 DNS Lookup Utility
ii bind9-libs:amd64 1:9.18.30-0ubuntu0.22.04.1 amd64 Shared Libraries used by BIND 9
ii bsdutils 1:2.37.2-4ubuntu3.4 amd64 basic utilities from 4.4BSD-Lite
ii ca-certificates 20240203~22.04.1 all Common CA certificates
ii catatonit 0.1.7-1 amd64 init process for containers
Expand All @@ -24,16 +24,16 @@ ii cri-o-runc 1.1.12~0 amd6
ii cri-tools 1.25.0~0 amd64 A command line tool used for creating OCI images.
ii criu 4.0-3 amd64 checkpoint and restore in userspace
ii crun 100:1.2-2 amd64 OCI runtime written in C
ii curl 7.81.0-1ubuntu1.19 amd64 command line tool for transferring data with URL syntax
ii curl 7.81.0-1ubuntu1.20 amd64 command line tool for transferring data with URL syntax
ii dash 0.5.11+git20210903+057cd650a4ed-3build1 amd64 POSIX-compliant shell
ii debconf 1.5.79ubuntu1 all Debian configuration management system
ii debianutils 5.5-1ubuntu2 amd64 Miscellaneous utilities specific to Debian
ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities
ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service
ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.19.2-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii dnsutils 1:9.18.30-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.19.3-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.4.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system
ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities
ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration
Expand Down Expand Up @@ -83,7 +83,7 @@ ii libcbor0.8:amd64 0.8.0-2ubuntu1 amd6
ii libcom-err2:amd64 1.46.5-2ubuntu1.2 amd64 common error description library
ii libcrypt1:amd64 1:4.4.27-1 amd64 libcrypt shared library
ii libcryptsetup12:amd64 2:2.4.3-1ubuntu1.2 amd64 disk encryption support - shared library
ii libcurl4:amd64 7.81.0-1ubuntu1.19 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour)
ii libcurl4:amd64 7.81.0-1ubuntu1.20 amd64 easy-to-use client-side URL transfer library (OpenSSL flavour)
ii libdb5.3:amd64 5.3.28+dfsg1-0.8ubuntu3 amd64 Berkeley v5.3 Database Libraries [runtime]
ii libdebconfclient0:amd64 0.261ubuntu1 amd64 Debian Configuration Management System (C-implementation library)
ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd64 Linux Kernel Device Mapper userspace library
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.45-1734029593-20090"
Version = "v0.0.45-1736763277-20236"

// SHA of the kic base image
baseImageSHA = "7b3f6168a578563fb342f21f0c926652b91ba060931e8fbc6c6ade3ac1d26ed9"
baseImageSHA = "83969f65230307cc877080bb419272e3a533a5fc87a51521ef2f6414384ed11e"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/20090"
isoBucket := "minikube-builds/iso/20236"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.45-1734029593-20090@sha256:7b3f6168a578563fb342f21f0c926652b91ba060931e8fbc6c6ade3ac1d26ed9")
--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.45-1736763277-20236@sha256:83969f65230307cc877080bb419272e3a533a5fc87a51521ef2f6414384ed11e")
--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)
Expand Down

0 comments on commit cbd4945

Please sign in to comment.