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

Merge pull request #16875 from minikube-bot/auto_bump_docker_version-10785b3 

Kicbase/ISO: Update docker from 24.0.2 to 24.0.4
pull/16878/head
Steven Powell 2023-07-13 14:35:34 -07:00 committed by GitHub
parent 34cfc6135a 0a4bbf8136
commit 7bf84ecf8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

1
deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
View File

@ -10,3 +10,4 @@ sha256 2c75cd6c3dc9b81cb5bde664c882e4339a2054e09cf09606f9f7dd6970e7f078 docker-
sha256 5c40bb7dcd1aad94be49ad75d24e7fd409119ed0eaad04f5d13c4fddfb397c8a docker-20.10.23.tgz
sha256 7856c7ab0bc5f324391a2922781bbda503bcfbdea1d71eb2b8d871ffc7f8b468 docker-24.0.1.tgz
sha256 0031d3dc42d94df846743ab59c07e3303bccf3bc26fc6d3e981b13e035babf81 docker-24.0.2.tgz
sha256 193a8e1f051adce6a30a4c8486ce9b39929b9633a0da8c96444c9239859f4354 docker-24.0.4.tgz

2
deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DOCKER_BIN_AARCH64_VERSION = 24.0.2
DOCKER_BIN_AARCH64_VERSION = 24.0.4
DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz

1
deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.hash
View File

@ -46,3 +46,4 @@ sha256 945c3a3ddcb79ee7307496c2f39eb3d8372466e8654e63d60bbb462e4a3c1427 docker-
sha256 0ee39f72cc434137d294c14d30897826bad6e24979e421f51a252769ad37e6d1 docker-20.10.23.tgz
sha256 298da71767e61b5b9bd40dda26e926d439106eab92df2cf66df6265d4046e3cf docker-24.0.1.tgz
sha256 fc07577bc0abdcdc02948493cd30b36cf0b096213fade9a7e699132c06c2e34c docker-24.0.2.tgz
sha256 0ab79ae5f19e2ef5bdc3c3009c8b770dea6189e0f1e0ef4935d78fd30519b11d docker-24.0.4.tgz

2
deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DOCKER_BIN_VERSION = 24.0.2
DOCKER_BIN_VERSION = 24.0.4
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz

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

@ -24,10 +24,10 @@ import (
const (
// Version is the current version of kic
Version = "v0.0.39-1689032083-15452"
Version = "v0.0.39-1689243385-16875"
// SHA of the kic base image
baseImageSHA = "41e03f55414b4bc4a9169ee03de8460ddd2a95f539efd83fce689159a4e20667"
baseImageSHA = "e35b6118254942d61d7256119170cb5fd4c54dbba4d11ba3ba6763f21da724f8"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// 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
func DefaultISOURLs() []string {
v := version.GetISOVersion()
isoBucket := "minikube-builds/iso/16765"
isoBucket := "minikube-builds/iso/16875"
return []string{
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

@ -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.39-1689032083-15452@sha256:41e03f55414b4bc4a9169ee03de8460ddd2a95f539efd83fce689159a4e20667")
--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.39-1689243385-16875@sha256:e35b6118254942d61d7256119170cb5fd4c54dbba4d11ba3ba6763f21da724f8")
--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)