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.1 to v1.7.2 #16634

Merged
merged 3 commits into from
Jun 5, 2023
Merged

Kicbase/ISO: Update containerd from v1.7.1 to v1.7.2 #16634

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
27587a2
Kicbase/ISO: Update containerd from v1.7.1 to v1.7.2
minikube-bot Jun 5, 2023
802d458
Updating kicbase image to v0.0.39-1685959646-16634
minikube-bot Jun 5, 2023
6805b8e
Updating ISO to v1.30.1-1685960108-16634
minikube-bot Jun 5, 2023
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 @@ -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.30.1-1685728855-16612
ISO_VERSION ?= v1.30.1-1685960108-16634

# 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 @@ -23,3 +23,4 @@ sha256 e9b84d52da7743000c1e8dae0175dda16d558a44cf80a5ae2556862205361a64 v1.6.18.
sha256 7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 v1.6.19.tar.gz
sha256 c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552 v1.7.0.tar.gz
sha256 fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a v1.7.1.tar.gz
sha256 68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43 v1.7.2.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.1
CONTAINERD_BIN_AARCH64_COMMIT = 1677a17964311325ed1c31e2c0a3589ce6d5c30d
CONTAINERD_BIN_AARCH64_VERSION = v1.7.2
CONTAINERD_BIN_AARCH64_COMMIT = 0cae528dd6cb557f7201036e9f43420650207b58
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 @@ -23,3 +23,4 @@ sha256 e9b84d52da7743000c1e8dae0175dda16d558a44cf80a5ae2556862205361a64 v1.6.18.
sha256 7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 v1.6.19.tar.gz
sha256 c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552 v1.7.0.tar.gz
sha256 fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a v1.7.1.tar.gz
sha256 68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43 v1.7.2.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.1
CONTAINERD_BIN_COMMIT = 1677a17964311325ed1c31e2c0a3589ce6d5c30d
CONTAINERD_BIN_VERSION = v1.7.2
CONTAINERD_BIN_COMMIT = 0cae528dd6cb557f7201036e9f43420650207b58
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.39-1685614080-16612"
Version = "v0.0.39-1685959646-16634"

// SHA of the kic base image
baseImageSHA = "50c05a21d08d2d144c4edfc35326683163da0e158a12f5fab89a708f4897b09c"
baseImageSHA = "197493132bd1eebb52a0757acb46d15a50bd5dc673e369e5145876a5268a6a6f"
// 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/16612"
isoBucket := "minikube-builds/iso/16634"

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 @@ -26,7 +26,7 @@ minikube start [flags]
--apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine
--apiserver-port int The apiserver listening port (default 8443)
--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.39-1685614080-16612@sha256:50c05a21d08d2d144c4edfc35326683163da0e158a12f5fab89a708f4897b09c")
--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.39-1685959646-16634@sha256:197493132bd1eebb52a0757acb46d15a50bd5dc673e369e5145876a5268a6a6f")
--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