Skip to content

Commit

Permalink
Kicbase/ISO: Update crun from 1.18 to 1.18.2 (kubernetes#19917)
Browse files Browse the repository at this point in the history 
* Kicbase/ISO: Update crun from 1.18 to 1.18.2

* Updating kicbase image to v0.0.45-1730888964-19917

* Updating ISO to v1.34.0-1730913550-19917
  • Loading branch information
@minikube-bot
minikube-bot authored Nov 7, 2024
1 parent 1143b52 commit 7cf7040
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
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-1730282777-19883
ISO_VERSION ?= v1.34.0-1730913550-19917

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

CRUN_LATEST_VERSION = 1.18
CRUN_LATEST_COMMIT = 8656b2548509fcc69ea7e8823a870564360a57a1
CRUN_LATEST_VERSION = 1.18.2
CRUN_LATEST_COMMIT = 00ab38af875ddd0d1a8226addda52e1de18339b5
# 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
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ ii libnghttp2-14:amd64 1.43.0-1ubuntu0.2 amd6
ii libnl-3-200:amd64 3.5.0-0.1 amd64 library for dealing with netlink sockets
ii libnpth0:amd64 1.6-3build2 amd64 replacement for GNU Pth using system threads
ii libnsl2:amd64 1.3.0-2build2 amd64 Public client interface for NIS(YP) and NIS+
ii libnvidia-container-tools 1.16.2-1 amd64 NVIDIA container runtime library (command-line tools)
ii libnvidia-container1:amd64 1.16.2-1 amd64 NVIDIA container runtime library
ii libnvidia-container-tools 1.17.0-1 amd64 NVIDIA container runtime library (command-line tools)
ii libnvidia-container1:amd64 1.17.0-1 amd64 NVIDIA container runtime library
ii libp11-kit0:amd64 0.24.0-6build1 amd64 library for loading and coordinating access to PKCS#11 modules - runtime
ii libpam-modules:amd64 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM
ii libpam-modules-bin 1.4.0-11ubuntu2.4 amd64 Pluggable Authentication Modules for PAM - helper binaries
Expand Down Expand Up @@ -196,8 +196,8 @@ ii ncurses-bin 6.3-2ubuntu0.1 amd6
ii netbase 6.3 all Basic TCP/IP networking system
ii netcat-openbsd 1.218-4ubuntu1 amd64 TCP/IP swiss army knife
ii nfs-common 1:2.6.1-1ubuntu1.2 amd64 NFS support files common to client and server
ii nvidia-container-toolkit 1.16.2-1 amd64 NVIDIA Container toolkit
ii nvidia-container-toolkit-base 1.16.2-1 amd64 NVIDIA Container Toolkit Base
ii nvidia-container-toolkit 1.17.0-1 amd64 NVIDIA Container toolkit
ii nvidia-container-toolkit-base 1.17.0-1 amd64 NVIDIA Container Toolkit Base
ii openssh-client 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) client, for secure access to remote machines
ii openssh-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) server, for secure access from remote machines
ii openssh-sftp-server 1:8.9p1-3ubuntu0.10 amd64 secure shell (SSH) sftp server module, for SFTP access from remote machines
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/kic/types.go
View file
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-1730282848-19883"
Version = "v0.0.45-1730888964-19917"

// SHA of the kic base image
baseImageSHA = "e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4"
baseImageSHA = "629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615"
// 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
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/19883"
isoBucket := "minikube-builds/iso/19917"

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
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-1730282848-19883@sha256:e762c909ad2a507083ec25b1ad3091c71fc7d92824e4a659c9158bbfe5ae03d4")
--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-1730888964-19917@sha256:629a5748e3ec15a091fef12257eb3754b8ffc0c974ebcbb016451c65d1829615")
--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 7cf7040

Please sign in to comment.