Skip to content

Commit d38da0b

Browse files
spowelljrspowelljr
authored
Merge pull request #11679 from afbjorklund/crun
ISO: Add packaging for crun
2 parents 52585e6 + 0a8032d commit d38da0b

File tree

9 files changed

+60
-3
lines changed

9 files changed

+60
-3
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.25.2-1648142972-13800
26+
ISO_VERSION ?= v1.25.2-1648488960-11679
2727
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
2828
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
2929
DEB_REVISION ?= 0

‎deploy/iso/minikube-iso/package/Config.in

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
menu "System tools"
22
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
3+
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in"
34
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
45
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
56
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"

‎deploy/iso/minikube-iso/package/crio-bin/Config.in

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ config BR2_PACKAGE_CRIO_BIN
99
depends on !BR2_STATIC_LIBS # lvm2
1010
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
1111
select BR2_PACKAGE_RUNC_MASTER
12+
select BR2_PACKAGE_CRUN
1213
select BR2_PACKAGE_CONMON
1314
select BR2_PACKAGE_BTRFS_PROGS
1415
select BR2_PACKAGE_LIBSECCOMP

‎deploy/iso/minikube-iso/package/crun/Config.in

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
config BR2_PACKAGE_CRUN
2+
bool "crun"
3+
select BR2_PACKAGE_YAJL
4+
help
5+
A fast and low-memory footprint OCI Container Runtime
6+
fully written in C.
7+
8+
https://github.com/containers/crun

‎deploy/iso/minikube-iso/package/crun/crun.hash

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Locally computed
2+
sha256 8065b73ae37ccfb960915fa10051e2bf27850d1c2c69ffeb9eec17c6f198d1c9 crun-0.19.tar.gz
3+
sha256 7b190ff934355e69636e24c12864326a6ebccdbb12af1f14bead217118eb19cb crun-0.19.1.tar.gz
4+
sha256 93423c730ac8deb8dacf805fb15dc5c3ac12e47f8a3eb36dd42166ccfd023d00 crun-0.20.tar.gz
5+
sha256 84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23 crun-0.20.1.tar.gz
6+
sha256 e1745172bf603c6832e1a77ee2b7ac9ad4644cd0f4349704df84b66385bbbe61 crun-1.0.tar.gz
7+
sha256 5f2d98a13bdd7ab3c83620abc7dc29cfaf7b8f7487b5b3722453bc9619d3ea0b crun-1.1.tar.gz
8+
sha256 1032a69878c18ddeeb97cd26251c2819afb76e0d4a50c047139829b00d147978 crun-1.2.tar.gz

‎deploy/iso/minikube-iso/package/crun/crun.mk

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
################################################################################
2+
#
3+
# crun
4+
#
5+
################################################################################
6+
7+
CRUN_VERSION = 1.2
8+
CRUN_COMMIT = 4f6c8e0583c679bfee6a899c05ac6b916022561b
9+
# need the pre-generated release tarball with the git submodules and configure
10+
CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION)
11+
CRUN_LICENSE = GPL-2.0
12+
CRUN_LICENSE_FILES = COPYING
13+
14+
CRUN_DEPENDENCIES += host-python3
15+
16+
CRUN_MAKE_OPTS = crun
17+
18+
ifeq ($(BR2_PACKAGE_LIBCAP),y)
19+
CRUN_DEPENDENCIES += libcap
20+
else
21+
CRUN_CONF_OPTS += --disable-caps
22+
endif
23+
24+
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
25+
CRUN_CONF_OPTS += --enable-seccomp
26+
CRUN_DEPENDENCIES += libseccomp host-pkgconf
27+
else
28+
CRUN_CONF_OPTS += --disable-seccomp
29+
endif
30+
31+
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
32+
CRUN_CONF_OPTS += --enable-systemd
33+
CRUN_DEPENDENCIES += systemd host-pkgconf
34+
else
35+
CRUN_CONF_OPTS += --disable-systemd
36+
endif
37+
38+
$(eval $(autotools-package))

‎deploy/iso/minikube-iso/package/podman/Config.in

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ config BR2_PACKAGE_PODMAN
66
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
77
depends on BR2_TOOLCHAIN_HAS_THREADS
88
select BR2_PACKAGE_RUNC_MASTER
9+
select BR2_PACKAGE_CRUN
910
select BR2_PACKAGE_CONMON
1011
select BR2_PACKAGE_LIBSECCOMP
1112
select BR2_PACKAGE_LIBGPGME

‎pkg/minikube/download/iso.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const fileScheme = "file"
4040
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4141
func DefaultISOURLs() []string {
4242
v := version.GetISOVersion()
43-
isoBucket := "minikube-builds/iso/13800"
43+
isoBucket := "minikube-builds/iso/11679"
4444
return []string{
4545
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
4646
fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),

‎site/content/en/docs/commands/start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ minikube start [flags]
6969
--insecure-registry strings Insecure Docker registries to pass to the Docker daemon. The default service CIDR range will automatically be added.
7070
--install-addons If set, install addons. Defaults to true. (default true)
7171
--interactive Allow user prompts for more information (default true)
72-
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13800/minikube-v1.25.2-1648142972-13800.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648142972-13800/minikube-v1.25.2-1648142972-13800.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648142972-13800.iso])
72+
--iso-url strings Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/11679/minikube-v1.25.2-1648488960-11679.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648488960-11679/minikube-v1.25.2-1648488960-11679.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648488960-11679.iso])
7373
--keep-context This will keep the existing kubectl context and will create a minikube context.
7474
--kubernetes-version string The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'.
7575
--kvm-gpu Enable experimental NVIDIA GPU support in minikube

0 commit comments

Comments
 (0)