Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kicbase/ISO: Update docker from 27.4.0 to 27.5.1 #20310

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+23 −21
Open

Kicbase/ISO: Update docker from 27.4.0 to 27.5.1 #20310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e00e8ce
Kicbase/ISO: Update docker from 27.4.0 to 27.5.1
minikube-bot Jan 23, 2025
763fd30
Updating kicbase image to v0.0.46-1737627388-20310
minikube-bot Jan 23, 2025
6b35644
Updating ISO to v1.35.0-1737627314-20310
minikube-bot Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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.35.0
ISO_VERSION ?= v1.35.0-1737627314-20310

# 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 deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ sha256 4e2a2ad6b888cfef5a82ab3d3299daf598a6d0bd2e4ee6c56b87b6a76bb80e34 docker-
sha256 0d11fabe8248d4be69cd6d4bf97beefbabb7d107fbdcfd267223b74993458c7c docker-27.3.0.tgz
sha256 4da6a6c7502b7ab561675a5ff5ac192d9b49d76d0b8847cf17ade246122279f4 docker-27.3.1.tgz
sha256 30885dd4e0dec8451d7e089242da77a5612822dcb5151c44d3d7193cb1e4d378 docker-27.4.0.tgz
sha256 e6b53725a73763ab3f988c73f8772eaed429754c1a579db5ff11f21990fd1817 docker-27.5.1.tgz
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

DOCKER_BIN_AARCH64_VERSION = 27.4.0
DOCKER_BIN_AARCH64_VERSION = 27.5.1
DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz

Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,4 @@ sha256 afa9895e15bd7c0cac3c57979edc5706a4d5e7ac78c902d22e3b426fedf0c8a8 docker-
sha256 1d47501a8fd99923ad655b1b85bb24f12b66db3b0e28c6dd12000d397b4f20d6 docker-27.3.0.tgz
sha256 9b4f6fe406e50f9085ee474c451e2bb5adb119a03591f467922d3b4e2ddf31d3 docker-27.3.1.tgz
sha256 64bb136b612a7bca537ef99b50504e4250cb71117c2d26552d20cda122b6c5b4 docker-27.4.0.tgz
sha256 4f798b3ee1e0140eab5bf30b0edc4e84f4cdb53255a429dc3bbae9524845d640 docker-27.5.1.tgz
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

DOCKER_BIN_VERSION = 27.4.0
DOCKER_BIN_VERSION = 27.5.1
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz

Expand Down
24 changes: 12 additions & 12 deletions hack/kicbase_version/os-package-list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ii ca-certificates 20240203~22.04.1 all
ii catatonit 0.1.7-1 amd64 init process for containers
ii conmon 100:2.1.2~0 amd64 OCI container runtime monitor
ii conntrack 1:1.4.6-2build2 amd64 Program to modify the conntrack tables
ii containerd.io 1.7.24-1 amd64 An open and reliable container runtime
ii containerd.io 1.7.25-1 amd64 An open and reliable container runtime
ii containernetworking-plugins 0.9.1+ds1-1ubuntu0.1 amd64 standard networking plugins - binaries
ii coreutils 8.32-4.1ubuntu1.2 amd64 GNU core utilities
ii cri-o 1.24.6~0 amd64 OCI-based implementation of Kubernetes Container Runtime Interface.
Expand All @@ -31,9 +31,9 @@ ii debianutils 5.5-1ubuntu2 amd6
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.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 docker-buildx-plugin 0.20.0-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:27.5.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.5.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 @@ -152,8 +152,8 @@ ii libprotobuf-c1:amd64 1.3.3-1ubuntu2.1 amd6
ii libprotobuf23:amd64 3.12.4-1ubuntu7.22.04.1 amd64 protocol buffers C++ library
ii libpsl5:amd64 0.21.0-1.2build2 amd64 Library for Public Suffix List (shared libraries)
ii libpython3-stdlib:amd64 3.10.6-1~22.04.1 amd64 interactive high-level object-oriented language (default python3 version)
ii libpython3.10-minimal:amd64 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10)
ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (standard library, version 3.10)
ii libpython3.10-minimal:amd64 3.10.12-1~22.04.8 amd64 Minimal subset of the Python language (version 3.10)
ii libpython3.10-stdlib:amd64 3.10.12-1~22.04.8 amd64 Interactive high-level object-oriented language (standard library, version 3.10)
ii libreadline8:amd64 8.1.2-1 amd64 GNU readline and history libraries, run-time libraries
ii librtmp1:amd64 2.4+20151223.gitfa8646d.1-2build4 amd64 toolkit for RTMP streams (shared library)
ii libsasl2-2:amd64 2.1.27+dfsg2-3ubuntu1.2 amd64 Cyrus SASL - authentication abstraction library
Expand Down Expand Up @@ -213,11 +213,11 @@ ii python3-minimal 3.10.6-1~22.04.1 amd6
ii python3-pkg-resources 59.6.0-1.2ubuntu0.22.04.2 all Package Discovery and Resource Access using pkg_resources
ii python3-protobuf 3.12.4-1ubuntu7.22.04.1 amd64 Python 3 bindings for protocol buffers
ii python3-six 1.16.0-3ubuntu1 all Python 2 and 3 compatibility library (Python 3 interface)
ii python3.10 3.10.12-1~22.04.7 amd64 Interactive high-level object-oriented language (version 3.10)
ii python3.10-minimal 3.10.12-1~22.04.7 amd64 Minimal subset of the Python language (version 3.10)
ii python3.10 3.10.12-1~22.04.8 amd64 Interactive high-level object-oriented language (version 3.10)
ii python3.10-minimal 3.10.12-1~22.04.8 amd64 Minimal subset of the Python language (version 3.10)
ii readline-common 8.1.2-1 all GNU readline and history libraries, common files
ii rpcbind 1.2.6-2build1 amd64 converts RPC program numbers into universal addresses
ii rsync 3.2.7-0ubuntu0.22.04.2 amd64 fast, versatile, remote (and local) file-copying tool
ii rsync 3.2.7-0ubuntu0.22.04.4 amd64 fast, versatile, remote (and local) file-copying tool
ii sed 4.8-1ubuntu2 amd64 GNU stream editor for filtering/transforming text
ii sensible-utils 0.0.17 all Utilities for sensible alternative selection
ii socat 1.7.4.1-3ubuntu4 amd64 multipurpose relay for bidirectional data transfer
Expand All @@ -231,7 +231,7 @@ ii ucf 3.0043 all
ii udev 249.11-0ubuntu3.12 amd64 /dev/ and hotplug management daemon
ii usrmerge 25ubuntu2 all Convert the system to the merged /usr directories scheme
ii util-linux 2.37.2-4ubuntu3.4 amd64 miscellaneous system utilities
ii vim-common 2:8.2.3995-1ubuntu2.21 all Vi IMproved - Common files
ii vim-tiny 2:8.2.3995-1ubuntu2.21 amd64 Vi IMproved - enhanced vi editor - compact version
ii xxd 2:8.2.3995-1ubuntu2.21 amd64 tool to make (or reverse) a hex dump
ii vim-common 2:8.2.3995-1ubuntu2.22 all Vi IMproved - Common files
ii vim-tiny 2:8.2.3995-1ubuntu2.22 amd64 Vi IMproved - enhanced vi editor - compact version
ii xxd 2:8.2.3995-1ubuntu2.22 amd64 tool to make (or reverse) a hex dump
ii zlib1g:amd64 1:1.2.11.dfsg-2ubuntu9.2 amd64 compression library - runtime
8 changes: 4 additions & 4 deletions pkg/drivers/kic/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.46"
Version = "v0.0.46-1737627388-20310"

// SHA of the kic base image
baseImageSHA = "fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279"
baseImageSHA = "a5b43c242d486020fa8230dbb31fd9680282ca14e47f0a264fc315f76dd1df2a"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase"
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
dockerhubRepo = "docker.io/kicbase/stable"
dockerhubRepo = "docker.io/kicbase/build"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Open in desktop
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/iso"
isoBucket := "minikube-builds/iso/20310"

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
Open in desktop
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:v0.0.46@sha256:fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279")
--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-1737627388-20310@sha256:a5b43c242d486020fa8230dbb31fd9680282ca14e47f0a264fc315f76dd1df2a")
--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