Skip to content

Commit 10bd017

Browse files
authored
Merge pull request #16191 from minikube-bot/auto_bump_runc_version-85a91eb
bump runc version to 1.1.5
2 parents 34cedd2 + c3e4342 commit 10bd017

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
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.29.0-1679912107-16168
26+
ISO_VERSION ?= v1.29.0-1680115329-16191
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/package/runc-master/runc-master.hash

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ sha256 91525356b71fbf8e05deddc955d3f40e0d4aedcb15d26bdd2850a9986852ae5b f46b6ba2
1616
sha256 49fbb25fda9fc416ec79a23e5382d504a8972a88247fe074f63ab71b6f38a0a0 52de29d7e0f8c0899bd7efb8810dd07f0073fa87.tar.gz
1717
sha256 9bb3be747237647cd232a47796d855e44fe295493f9661a4013835393ea65d46 a916309fff0f838eb94e928713dbc3c0d0ac7aa4.tar.gz
1818
sha256 ab2b685fcece3a97ddcb8402879d1e05580a5b94f9d0aa3bae339db1e5dae686 5fd4c4d144137e991c4acebb2146ab1483a97925.tar.gz
19+
sha256 76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2 v1.1.5.tar.gz

deploy/iso/minikube-iso/package/runc-master/runc-master.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
RUNC_MASTER_VERSION = v1.1.4
8-
RUNC_MASTER_COMMIT = 5fd4c4d144137e991c4acebb2146ab1483a97925
7+
RUNC_MASTER_VERSION = v1.1.5
8+
RUNC_MASTER_COMMIT = f19387a6bec4944c770f7668ab51c4348d9c2f38
99
RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive
1010
RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz
1111
RUNC_MASTER_LICENSE = Apache-2.0

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.37-1679075007-16079"
27+
Version = "v0.0.37-1680126204-16191"
2828

2929
// SHA of the kic base image
30-
baseImageSHA = "9d2bf610e530f47c7e43df9719717075e4c7ec510aea6047b29208bffe7f1978"
30+
baseImageSHA = "791c2c6064f76a51b56660502efe30ae73fc22cfed790c7cbe55a27745df2e41"
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/16168"
44+
isoBucket := "minikube-builds/iso/16191"
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
@@ -26,7 +26,7 @@ minikube start [flags]
2626
--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
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
29-
--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.37-1679075007-16079@sha256:9d2bf610e530f47c7e43df9719717075e4c7ec510aea6047b29208bffe7f1978")
29+
--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.37-1680126204-16191@sha256:791c2c6064f76a51b56660502efe30ae73fc22cfed790c7cbe55a27745df2e41")
3030
--binary-mirror string Location to fetch kubectl, kubelet, & kubeadm binaries from.
3131
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3232
--cert-expiration duration Duration until minikube certificate expiration, defaults to three years (26280h). (default 26280h0m0s)

0 commit comments

Comments
 (0)