Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kicbase/ISO: Update containerd from v1.7.19 to v1.7.20 #19298

Merged
merged 3 commits into from
Jul 19, 2024
Merged

Kicbase/ISO: Update containerd from v1.7.19 to v1.7.20 #19298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0298f2f
Kicbase/ISO: Update containerd from v1.7.19 to v1.7.20
minikube-bot Jul 18, 2024
ba4ae05
Updating kicbase image to v0.0.44-1721324606-19298
minikube-bot Jul 18, 2024
42fd8fa
Updating ISO to v1.33.1-1721324531-19298
minikube-bot Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-1721146474-19264
ISO_VERSION ?= v1.33.1-1721324531-19298

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.
sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17.tar.gz
sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.tar.gz
sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz
sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# containerd
#
################################################################################
CONTAINERD_BIN_AARCH64_VERSION = v1.7.19
CONTAINERD_BIN_AARCH64_COMMIT = 2bf793ef6dc9a18e00cb12efb64355c2c9d5eb41
CONTAINERD_BIN_AARCH64_VERSION = v1.7.20
CONTAINERD_BIN_AARCH64_COMMIT = 8fc6bcff51318944179630522a095cc9dbf9f353
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
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.
sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17.tar.gz
sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.tar.gz
sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz
sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# containerd
#
################################################################################
CONTAINERD_BIN_VERSION = v1.7.19
CONTAINERD_BIN_COMMIT = 2bf793ef6dc9a18e00cb12efb64355c2c9d5eb41
CONTAINERD_BIN_VERSION = v1.7.20
CONTAINERD_BIN_COMMIT = 8fc6bcff51318944179630522a095cc9dbf9f353
CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.44-1721234491-19282"
Version = "v0.0.44-1721324606-19298"

// SHA of the kic base image
baseImageSHA = "af477ffa9f6167a73f0adae71d3a4e601ba0c2adc97a4067255b422b3477d2c2"
baseImageSHA = "1c495b056df42bd3fd9a5c30d049e1802f9ed73a342611781f1ccc3c3853953f"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/19264"
isoBucket := "minikube-builds/iso/19298"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/commands/start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-1721234491-19282@sha256:af477ffa9f6167a73f0adae71d3a4e601ba0c2adc97a4067255b422b3477d2c2")
--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-1721324606-19298@sha256:1c495b056df42bd3fd9a5c30d049e1802f9ed73a342611781f1ccc3c3853953f")
--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)
Expand Down