Skip to content

Commit 369cb86

Browse files
authored
Merge pull request #17634 from minikube-bot/auto_bump_containerd_version-50e54d8
Kicbase/ISO: Update containerd from v1.7.8 to v1.7.9
2 parents ca71a84 + 6a47c51 commit 369cb86

File tree

8 files changed

+11
-9
lines changed

8 files changed

+11
-9
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
2323
KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)
2424

2525
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
26-
ISO_VERSION ?= v1.32.1-1699648094-17581
26+
ISO_VERSION ?= v1.32.1-1700142131-17634
2727

2828
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
2929
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash

+1
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ sha256 1fd19d2c75322bdbcb01d190a18d53940a4a79d909bd61a99f9e8e2dbc57a8fe v1.7.3.t
2828
sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.tar.gz
2929
sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz
3030
sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz
31+
sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# containerd
44
#
55
################################################################################
6-
CONTAINERD_BIN_AARCH64_VERSION = v1.7.8
7-
CONTAINERD_BIN_AARCH64_COMMIT = 8e4b0bde866788eec76735cc77c4720144248fb7
6+
CONTAINERD_BIN_AARCH64_VERSION = v1.7.9
7+
CONTAINERD_BIN_AARCH64_COMMIT = 4f03e100cb967922bec7459a78d16ccbac9bb81d
88
CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive
99
CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz
1010
CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme

deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash

+1
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ sha256 1fd19d2c75322bdbcb01d190a18d53940a4a79d909bd61a99f9e8e2dbc57a8fe v1.7.3.t
2828
sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.tar.gz
2929
sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz
3030
sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz
31+
sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz

deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# containerd
44
#
55
################################################################################
6-
CONTAINERD_BIN_VERSION = v1.7.8
7-
CONTAINERD_BIN_COMMIT = 8e4b0bde866788eec76735cc77c4720144248fb7
6+
CONTAINERD_BIN_VERSION = v1.7.9
7+
CONTAINERD_BIN_COMMIT = 4f03e100cb967922bec7459a78d16ccbac9bb81d
88
CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
99
CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
1010
CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme

pkg/drivers/kic/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.42-1699485386-17565"
27+
Version = "v0.0.42-1700142204-17634"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "bc7ff092e883443bfc1c9fb6a45d08012db3c0fc68e914887b7f16ccdefcab24"
30+
baseImageSHA = "b5ff7180d8eca5924b7e763cf222f5d9cfa39b21ab2c921f1394f3275e214b50"
3131
// The name of the GCR kicbase repository
3232
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3333
// The name of the Dockerhub kicbase repository

pkg/minikube/download/iso.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const fileScheme = "file"
4141
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4242
func DefaultISOURLs() []string {
4343
v := version.GetISOVersion()
44-
isoBucket := "minikube-builds/iso/17581"
44+
isoBucket := "minikube-builds/iso/17634"
4545

4646
return []string{
4747
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),

site/content/en/docs/commands/start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ minikube start [flags]
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-pause-interval duration Duration of inactivity before the minikube VM is paused (default 1m0s). To disable, set to 0s (default 1m0s)
2929
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
30-
--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.42-1699485386-17565@sha256:bc7ff092e883443bfc1c9fb6a45d08012db3c0fc68e914887b7f16ccdefcab24")
30+
--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.42-1700142204-17634@sha256:b5ff7180d8eca5924b7e763cf222f5d9cfa39b21ab2c921f1394f3275e214b50")
3131
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3232
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3333
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

0 commit comments

Comments
 (0)