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 26.1.4 to 27.0.1 #19142

Merged
merged 3 commits into from
Jun 27, 2024
Merged

Kicbase/ISO: Update docker from 26.1.4 to 27.0.1 #19142

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
ca3d2a0
Kicbase/ISO: Update docker from 26.1.4 to 27.0.1
minikube-bot Jun 26, 2024
48434be
Updating kicbase image to v0.0.44-1719413016-19142
minikube-bot Jun 26, 2024
73a6577
Updating ISO to v1.33.1-1719412936-19142
minikube-bot Jun 26, 2024
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.33.1-1719245461-19128
ISO_VERSION ?= v1.33.1-1719412936-19142

# 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 @@ -20,3 +20,4 @@ sha256 ffb86d77f764e544fe9dcf1c10296adebb7db01a18a5b9bce7d41814d852a8f4 docker-
sha256 daf6326d790e114db759733f88ebe8a4d0dc56abf0e810fe62548c5f8e054b56 docker-26.0.2.tgz
sha256 751e0806aa8e80aa16b076ff91e4311f41b69394fdab84ca57cf5115192c3f52 docker-26.1.3.tgz
sha256 6f1a5fb161aef875d305ee4f79e65492b3c13e90dbe0a339df2ad6515e4f6849 docker-26.1.4.tgz
sha256 8ee4de2ee8598c5d549a181d89eede9ac325c3c9df93da04e557253e487e68b0 docker-27.0.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 = 26.1.4
DOCKER_BIN_AARCH64_VERSION = 27.0.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 @@ -56,3 +56,4 @@ sha256 d362e648f6a7cccbe313145864d2316ab3114abb22c15a685427ebd5cb306078 docker-
sha256 118a556898671cceb4d5d726b9114ca5cbbae5b5956716eb92f465932f1c6363 docker-26.0.2.tgz
sha256 a50076d372d3bbe955664707af1a4ce4f5df6b2d896e68b12ecc74e724d1db31 docker-26.1.3.tgz
sha256 a9cede81aa3337f310132c2c920dba2edc8d29b7d97065b63ba41cf47ae1ca4f docker-26.1.4.tgz
sha256 1e65f8bd3ac5ba8a4267a680a5427b59f8af1c1a3853bdbf77cdcaa33d5f6504 docker-27.0.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 = 26.1.4
DOCKER_BIN_VERSION = 27.0.1
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz

Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
View file
Open in desktop
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.44-1719245474-19128"
Version = "v0.0.44-1719413016-19142"

// SHA of the kic base image
baseImageSHA = "bbc3efa956ea8111b9efadfdfeff422d4c4d743a7756ec7b74c70abade56ceb8"
baseImageSHA = "af368900f8c68437efd9db2dba61a03b07068e5b9fe0dc8d7f46be199657779d"
// 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
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-builds/iso/19128"
isoBucket := "minikube-builds/iso/19142"

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-builds:v0.0.44-1719245474-19128@sha256:bbc3efa956ea8111b9efadfdfeff422d4c4d743a7756ec7b74c70abade56ceb8")
--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.44-1719413016-19142@sha256:af368900f8c68437efd9db2dba61a03b07068e5b9fe0dc8d7f46be199657779d")
--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
Loading