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 24.0.4 to 24.0.5 #17120

Merged
merged 3 commits into from
Aug 24, 2023
Merged

Kicbase/ISO: Update docker from 24.0.4 to 24.0.5 #17120

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
ef8318e
Kicbase/ISO: Update docker from 24.0.4 to 24.0.5
minikube-bot Aug 24, 2023
2e923e7
Updating kicbase image to v0.0.40-1692872184-17120
minikube-bot Aug 24, 2023
02da498
Updating ISO to v1.31.0-1692872107-17120
minikube-bot Aug 24, 2023
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 @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)

# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.31.0
ISO_VERSION ?= v1.31.0-1692872107-17120

# 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 @@ -11,3 +11,4 @@ sha256 5c40bb7dcd1aad94be49ad75d24e7fd409119ed0eaad04f5d13c4fddfb397c8a docker-
sha256 7856c7ab0bc5f324391a2922781bbda503bcfbdea1d71eb2b8d871ffc7f8b468 docker-24.0.1.tgz
sha256 0031d3dc42d94df846743ab59c07e3303bccf3bc26fc6d3e981b13e035babf81 docker-24.0.2.tgz
sha256 193a8e1f051adce6a30a4c8486ce9b39929b9633a0da8c96444c9239859f4354 docker-24.0.4.tgz
sha256 ba911d9ff8a54a7afc8f91e998984f78a704bcb4932134c4dda2c401209a9921 docker-24.0.5.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 = 24.0.4
DOCKER_BIN_AARCH64_VERSION = 24.0.5
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 @@ -47,3 +47,4 @@ sha256 0ee39f72cc434137d294c14d30897826bad6e24979e421f51a252769ad37e6d1 docker-
sha256 298da71767e61b5b9bd40dda26e926d439106eab92df2cf66df6265d4046e3cf docker-24.0.1.tgz
sha256 fc07577bc0abdcdc02948493cd30b36cf0b096213fade9a7e699132c06c2e34c docker-24.0.2.tgz
sha256 0ab79ae5f19e2ef5bdc3c3009c8b770dea6189e0f1e0ef4935d78fd30519b11d docker-24.0.4.tgz
sha256 0a5f3157ce25532c5c1261a97acf3b25065cfe25940ef491fa01d5bea18ddc86 docker-24.0.5.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 = 24.0.4
DOCKER_BIN_VERSION = 24.0.5
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.40-1692613578-17086"
Version = "v0.0.40-1692872184-17120"

// SHA of the kic base image
baseImageSHA = "95d17727509667642a071be45fb75a65d8a399e35185dd68dcf504256dec81ac"
baseImageSHA = "42602f0d347faca66d9347bdc33243fe5f4d6b3fff3ba53f3b2fc2d5fe63e9ec"
// 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/16971"
isoBucket := "minikube-builds/iso/17120"

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 @@ -26,7 +26,7 @@ minikube start [flags]
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
--apiserver-port int The apiserver listening port (default 8443)
--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.40-1692613578-17086@sha256:95d17727509667642a071be45fb75a65d8a399e35185dd68dcf504256dec81ac")
--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.40-1692872184-17120@sha256:42602f0d347faca66d9347bdc33243fe5f4d6b3fff3ba53f3b2fc2d5fe63e9ec")
--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