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

Merge pull request #17527 from minikube-bot/auto_bump_containerd_version-12f5db0 

Kicbase/ISO: Update containerd from v1.7.7 to v1.7.8
pull/17532/head
Steven Powell 2023-10-31 10:23:01 -07:00 committed by GitHub
parent d8526db80e e4a17a129f
commit 58f14a7dc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 11 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.0
ISO_VERSION ?= v1.32.0-1698684775-17527
# 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

@ -27,3 +27,4 @@ sha256 68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43 v1.7.2.t
sha256 1fd19d2c75322bdbcb01d190a18d53940a4a79d909bd61a99f9e8e2dbc57a8fe v1.7.3.tar.gz
sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.tar.gz
sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz
sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.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.7
CONTAINERD_BIN_AARCH64_COMMIT = 8c087663b0233f6e6e2f4515cee61d49f14746a8
CONTAINERD_BIN_AARCH64_VERSION = v1.7.8
CONTAINERD_BIN_AARCH64_COMMIT = 8e4b0bde866788eec76735cc77c4720144248fb7
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

@ -27,3 +27,4 @@ sha256 68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43 v1.7.2.t
sha256 1fd19d2c75322bdbcb01d190a18d53940a4a79d909bd61a99f9e8e2dbc57a8fe v1.7.3.tar.gz
sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.tar.gz
sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz
sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.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.7
CONTAINERD_BIN_COMMIT = 8c087663b0233f6e6e2f4515cee61d49f14746a8
CONTAINERD_BIN_VERSION = v1.7.8
CONTAINERD_BIN_COMMIT = 8e4b0bde866788eec76735cc77c4720144248fb7
CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme

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

@ -24,14 +24,14 @@ import (
const (
// Version is the current version of kic
Version = "v0.0.41"
Version = "v0.0.41-1698660445-17527"
// SHA of the kic base image
baseImageSHA = "dbb2380b629f0776f6e6e49b5825fe42814849b2a6ad4707fbcf87004835f612"
baseImageSHA = "34cb83e9cb3f0fe3ce8dcb727a873b33aee680fdd682fbcb5c46db345e9f67df"
// 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 (

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/iso"
isoBucket := "minikube-builds/iso/17527"
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:v0.0.41@sha256:dbb2380b629f0776f6e6e49b5825fe42814849b2a6ad4707fbcf87004835f612")
--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.41-1698660445-17527@sha256:34cb83e9cb3f0fe3ce8dcb727a873b33aee680fdd682fbcb5c46db345e9f67df")
--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)