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 crun from 1.18.2 to 1.19 #20083

Merged
merged 3 commits into from
Dec 12, 2024
Merged

Kicbase/ISO: Update crun from 1.18.2 to 1.19 #20083

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
4881fda
Kicbase/ISO: Update crun from 1.18.2 to 1.19
minikube-bot Dec 11, 2024
086f8e5
Updating kicbase image to v0.0.45-1733912881-20083
minikube-bot Dec 11, 2024
6c4fcf3
Updating ISO to v1.34.0-1733936888-20083
minikube-bot Dec 11, 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-1730913550-19917
ISO_VERSION ?= v1.34.0-1733936888-20083

# 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/crun-latest/crun-latest.hash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ sha256 70548de4874f0c9e7e1e080ff092e23f8fcc772a23261ee26e26d79f24df289e crun-1.1
sha256 b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874 crun-1.17.tar.gz
sha256 a83b70b350e50ad320376685e975afae535dad64e982e2b7c57a0db45663902a crun-1.18.tar.gz
sha256 fdd530a398e32c36ccb597a43d17692631257374b9121027d88bbc5bccb24442 crun-1.18.2.tar.gz
sha256 f37ae4936832a4bde31d50028307e83bcc7af80f2d36779f4ac7c79cdfe682b0 crun-1.19.tar.gz
4 changes: 2 additions & 2 deletions deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
################################################################################

CRUN_LATEST_VERSION = 1.18.2
CRUN_LATEST_COMMIT = 00ab38af875ddd0d1a8226addda52e1de18339b5
CRUN_LATEST_VERSION = 1.19
CRUN_LATEST_COMMIT = db31c42ac46e20b5527f5339dcbf6f023fcd539c
# 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
8 changes: 4 additions & 4 deletions hack/kicbase_version/os-package-list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ ii debianutils 5.5-1ubuntu2 amd6
ii diffutils 1:3.8-0ubuntu2 amd64 File comparison utilities
ii dirmngr 2.2.27-3ubuntu2.1 amd64 GNU privacy guard - network certificate management service
ii dnsutils 1:9.18.28-0ubuntu0.22.04.1 all Transitional package for bind9-dnsutils
ii docker-buildx-plugin 0.17.1-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.3.1-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii docker-buildx-plugin 0.19.2-1~ubuntu.22.04~jammy amd64 Docker Buildx cli plugin.
ii docker-ce 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker: the open-source application container engine
ii docker-ce-cli 5:27.4.0-1~ubuntu.22.04~jammy amd64 Docker CLI: the open-source application container engine
ii dpkg 1.21.1ubuntu2.3 amd64 Debian package management system
ii e2fsprogs 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system utilities
ii ebtables 2.0.11-4build2 amd64 Ethernet bridge frame table administration
Expand Down Expand Up @@ -90,7 +90,7 @@ ii libdevmapper1.02.1:amd64 2:1.02.175-2.1ubuntu4 amd6
ii libedit2:amd64 3.1-20210910-1build1 amd64 BSD editline and history libraries
ii libelf1:amd64 0.186-1build1 amd64 library to read and write ELF files
ii libevent-core-2.1-7:amd64 2.1.12-stable-1build3 amd64 Asynchronous event notification library (core)
ii libexpat1:amd64 2.4.7-1ubuntu0.4 amd64 XML parsing C library - runtime library
ii libexpat1:amd64 2.4.7-1ubuntu0.5 amd64 XML parsing C library - runtime library
ii libext2fs2:amd64 1.46.5-2ubuntu1.2 amd64 ext2/ext3/ext4 file system libraries
ii libffi8:amd64 3.4.2-4 amd64 Foreign Function Interface library runtime
ii libfido2-1:amd64 1.10.0-1 amd64 library for generating and verifying FIDO 2.0 objects
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.45-1733735246-20065"
Version = "v0.0.45-1733912881-20083"

// SHA of the kic base image
baseImageSHA = "e2b2594040af1f94a2d350dd3f565070ba8462b217eda2b8fa6ce1f4dfdfb872"
baseImageSHA = "64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2"
// 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/19917"
isoBucket := "minikube-builds/iso/20083"

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 @@ -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.45-1733735246-20065@sha256:e2b2594040af1f94a2d350dd3f565070ba8462b217eda2b8fa6ce1f4dfdfb872")
--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.45-1733912881-20083@sha256:64d8b27f78fd269d886e21ba8fc88be20de183ba5cc5bce33d0810e8a65f1df2")
--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