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 runc from v1.1.13 to v1.1.14 #19598

Merged
merged 3 commits into from
Sep 12, 2024
Merged

Kicbase/ISO: Update runc from v1.1.13 to v1.1.14 #19598

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
911e8a5
Kicbase/ISO: Update runc from v1.1.13 to v1.1.14
minikube-bot Sep 9, 2024
9c6f4e4
Updating ISO to v1.34.0-1725912912-19598
minikube-bot Sep 10, 2024
cb70ad9
Updating kicbase image to v0.0.45-1725963390-19606
spowelljr Sep 10, 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.34.0
ISO_VERSION ?= v1.34.0-1725912912-19598

# 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/package/runc-master/runc-master.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ sha256 e26ae522d09b253b64a30b4e4d233988c988f7588178308b51da7aec927df47b v1.1.10.
sha256 129ad7cd470e4bdc82cdd3d5f0aa93e43674bf8ea115da2b42a27361885fe3ee v1.1.11.tar.gz
sha256 be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 v1.1.12.tar.gz
sha256 789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25 v1.1.13.tar.gz
sha256 563cf57c38d2e7149234dbe6f63ca0751eb55ef8f586ed12a543dedc1aceba68 v1.1.14.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/package/runc-master/runc-master.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

RUNC_MASTER_VERSION = v1.1.13
RUNC_MASTER_COMMIT = 58aa9203c123022138b22cf96540c284876a7910
RUNC_MASTER_VERSION = v1.1.14
RUNC_MASTER_COMMIT = 2c9f5602f0ba3d9da1c2596322dfc4e156844890
RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive
RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz
RUNC_MASTER_LICENSE = Apache-2.0
Expand Down
8 changes: 4 additions & 4 deletions pkg/drivers/kic/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (

const (
// Version is the current version of kic
Version = "v0.0.45"
Version = "v0.0.45-1725963390-19606"

// SHA of the kic base image
baseImageSHA = "81df288595202a317b1a4dc2506ca2e4ed5f22373c19a441b88cfbf4b9867c85"
baseImageSHA = "05c3fb4a3ac73e1a547cb186e5aec949a4a3d18af7d1444e0d1365c17dbedef9"
// The name of the GCR kicbase repository
gcrRepo = "gcr.io/k8s-minikube/kicbase"
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
// The name of the Dockerhub kicbase repository
dockerhubRepo = "docker.io/kicbase/stable"
dockerhubRepo = "docker.io/kicbase/build"
)

var (
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/iso"
isoBucket := "minikube-builds/iso/19598"

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