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

Merge pull request #17765 from minikube-bot/auto_bump_containerd_version-ce19218 

Kicbase/ISO: Update containerd from v1.7.10 to v1.7.11
pull/17809/head
Steven Powell 2023-12-15 08:25:49 -08:00 committed by GitHub
parent 15d4ff751d 1424aa3b31
commit 454e78604f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 9 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.32.1-1702394653-17761
ISO_VERSION ?= v1.32.1-1702490427-17765
# 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/containerd-bin-aarch64/containerd-bin.hash
View File

@ -30,3 +30,4 @@ sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.t
sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz
sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz
sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz
sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.tar.gz

4
deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
View File

@ -3,8 +3,8 @@
# containerd
#
################################################################################
CONTAINERD_BIN_AARCH64_VERSION = v1.7.10
CONTAINERD_BIN_AARCH64_COMMIT = 4e1fe7492b9df85914c389d1f15a3ceedbb280ac
CONTAINERD_BIN_AARCH64_VERSION = v1.7.11
CONTAINERD_BIN_AARCH64_COMMIT = 64b8a811b07ba6288238eefc14d898ee0b5b99ba
CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive
CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz
CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme

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

@ -30,3 +30,4 @@ sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.t
sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz
sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz
sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz
sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.tar.gz

4
deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk
View File

@ -3,8 +3,8 @@
# containerd
#
################################################################################
CONTAINERD_BIN_VERSION = v1.7.10
CONTAINERD_BIN_COMMIT = 4e1fe7492b9df85914c389d1f15a3ceedbb280ac
CONTAINERD_BIN_VERSION = v1.7.11
CONTAINERD_BIN_COMMIT = 64b8a811b07ba6288238eefc14d898ee0b5b99ba
CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme

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

@ -24,10 +24,10 @@ import (
const (
// Version is the current version of kic
Version = "v0.0.42-1702394725-17761"
Version = "v0.0.42-1702585004-17765"
// SHA of the kic base image
baseImageSHA = "d54bd539f5344c99d05c8897079f380df5ad03e2c1323e08060f77c1f95b4517"
baseImageSHA = "ba2fbb9efd5b81a443834ba0800f3bc13feea942ce199df74b0054a9bdb32bbd"
// 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/17761"
isoBucket := "minikube-builds/iso/17765"
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

@ -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). To disable, set to 0s (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.42-1702394725-17761@sha256:d54bd539f5344c99d05c8897079f380df5ad03e2c1323e08060f77c1f95b4517")
--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.42-1702585004-17765@sha256:ba2fbb9efd5b81a443834ba0800f3bc13feea942ce199df74b0054a9bdb32bbd")
--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)