Skip to content

Commit

Permalink
Merge pull request #19112 from minikube-bot/auto_bump_crun_version-c3…
Browse files Browse the repository at this point in the history
…cfbfa

Kicbase/ISO: Update crun from 1.14.4 to 1.15
  • Loading branch information
spowelljr authored Jun 21, 2024
2 parents cd3dc48 + dd2bef9 commit f6e0120
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
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-1718753593-19106
ISO_VERSION ?= v1.33.1-1718923868-19112

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ sha256 5f2d98a13bdd7ab3c83620abc7dc29cfaf7b8f7487b5b3722453bc9619d3ea0b crun-1.
sha256 1032a69878c18ddeeb97cd26251c2819afb76e0d4a50c047139829b00d147978 crun-1.2.tar.gz
sha256 f6ceb53ef6c686b1e8bc7e4a52cfac3ebec915edc6bc750ac600a8b3decb6e13 crun-1.14.tar.gz
sha256 5527013bfdac4001f242fbc3b544d01837d942f426fdefcc296f0d271594eeb4 crun-1.14.4.tar.gz
sha256 a03ba1e58b8823ae77d010024b43bd94c5a99f7d652257b1b23abd2d2cdb087f crun-1.15.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

CRUN_LATEST_VERSION = 1.14.4
CRUN_LATEST_COMMIT = a220ca661ce078f2c37b38c92e66cf66c012d9c1
CRUN_LATEST_VERSION = 1.15
CRUN_LATEST_COMMIT = e6eacaf4034e84185fd8780ac9262bbf57082278
# need the pre-generated release tarball with the git submodules and configure
CRUN_LATEST_SITE = https://github.com/containers/crun/releases/download/$(CRUN_LATEST_VERSION)
CRUN_LATEST_LICENSE = GPL-2.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
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-1718753665-19106"
Version = "v0.0.44-1718923403-19112"

// SHA of the kic base image
baseImageSHA = "735aacbd61d487240dc39ba6e4d70dd6ae1ad6181ca2ba092d372605e48ee636"
baseImageSHA = "cc061048d931d84aa4a945fb4686882929674aeba8a6ed833c4fb3a3c2b6805e"
// 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
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/19106"
isoBucket := "minikube-builds/iso/19112"

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
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-1718753665-19106@sha256:735aacbd61d487240dc39ba6e4d70dd6ae1ad6181ca2ba092d372605e48ee636")
--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-1718923403-19112@sha256:cc061048d931d84aa4a945fb4686882929674aeba8a6ed833c4fb3a3c2b6805e")
--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

0 comments on commit f6e0120

Please sign in to comment.