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

Merge pull request #16168 from minikube-bot/auto_bump_containerd_version-3b00a4c 

bump containerd version
pull/16177/head
Medya Ghazizadeh 2023-03-27 16:33:04 -07:00 committed by GitHub
parent bae9c4e3c0 a6b0f9925e
commit 862efeecff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 6 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.29.0-1679074930-16079
ISO_VERSION ?= v1.29.0-1679912107-16168
# 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

@ -21,3 +21,4 @@ sha256 a034b2273533207d5d96bef8bd3fce1efff85139815efb756d90c705ae1a05ce v1.6.9.t
sha256 ee170fa73b258e448f9b6729440d38c77d19cd9bec46e45cd195d4670cd8b004 v1.6.15.tar.gz
sha256 e9b84d52da7743000c1e8dae0175dda16d558a44cf80a5ae2556862205361a64 v1.6.18.tar.gz
sha256 7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 v1.6.19.tar.gz
sha256 c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552 v1.7.0.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.6.19
CONTAINERD_BIN_AARCH64_COMMIT = 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f
CONTAINERD_BIN_AARCH64_VERSION = v1.7.0
CONTAINERD_BIN_AARCH64_COMMIT = 1fbd70374134b891f97ce19c70b6e50c7b9f4e0d
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

@ -21,3 +21,4 @@ sha256 a034b2273533207d5d96bef8bd3fce1efff85139815efb756d90c705ae1a05ce v1.6.9.t
sha256 ee170fa73b258e448f9b6729440d38c77d19cd9bec46e45cd195d4670cd8b004 v1.6.15.tar.gz
sha256 e9b84d52da7743000c1e8dae0175dda16d558a44cf80a5ae2556862205361a64 v1.6.18.tar.gz
sha256 7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 v1.6.19.tar.gz
sha256 c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552 v1.7.0.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.6.19
CONTAINERD_BIN_COMMIT = 1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f
CONTAINERD_BIN_VERSION = v1.7.0
CONTAINERD_BIN_COMMIT = 1fbd70374134b891f97ce19c70b6e50c7b9f4e0d
CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme

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/16079"
isoBucket := "minikube-builds/iso/16168"
return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),