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

Merge pull request #19106 from minikube-bot/auto_bump_containerd_version-fb57954 

Kicbase/ISO: Update containerd from v1.7.17 to v1.7.18
pull/19115/head
Steven Powell 2024-06-20 15:40:10 -07:00 committed by GitHub
parent fb579548a8 0b6579e93b
commit c3cfbfae86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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

@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
ISO_VERSION ?= v1.33.1-1718705708-19104
ISO_VERSION ?= v1.33.1-1718753593-19106
# 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

@ -34,3 +34,4 @@ sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.
sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 v1.7.14.tar.gz
sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.tar.gz
sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17.tar.gz
sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.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.17
CONTAINERD_BIN_AARCH64_COMMIT = 3a4de459a68952ffb703bbe7f2290861a75b6b67
CONTAINERD_BIN_AARCH64_VERSION = v1.7.18
CONTAINERD_BIN_AARCH64_COMMIT = ae71819c4f5e67bb4d5ae76a6b735f29cc25774e
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

@ -34,3 +34,4 @@ sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.
sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 v1.7.14.tar.gz
sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.tar.gz
sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17.tar.gz
sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.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.17
CONTAINERD_BIN_COMMIT = 3a4de459a68952ffb703bbe7f2290861a75b6b67
CONTAINERD_BIN_VERSION = v1.7.18
CONTAINERD_BIN_COMMIT = ae71819c4f5e67bb4d5ae76a6b735f29cc25774e
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.44-1718705787-19104"
Version = "v0.0.44-1718753665-19106"
// SHA of the kic base image
baseImageSHA = "447491347226ad2b46e499eb4c705d68f818565c02b031ba9d03595e422120d0"
baseImageSHA = "735aacbd61d487240dc39ba6e4d70dd6ae1ad6181ca2ba092d372605e48ee636"
// 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/19104"
isoBucket := "minikube-builds/iso/19106"
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) (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.44-1718705787-19104@sha256:447491347226ad2b46e499eb4c705d68f818565c02b031ba9d03595e422120d0")
--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.44-1718753665-19106@sha256:735aacbd61d487240dc39ba6e4d70dd6ae1ad6181ca2ba092d372605e48ee636")
--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)