Skip to content

Commit 77d31a3

Browse files
authored
Merge pull request #18213 from BlaineEXE/add-cephf-modules-to-arm-iso
add ceph fs kernel driver to arm iso
2 parents 5d4be2f + d7784bd commit 77d31a3

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
2424
HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
2525

2626
# Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
27-
ISO_VERSION ?= v1.32.1-1710348681-18375
27+
ISO_VERSION ?= v1.32.1-1710459732-18213
2828

2929
# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
3030
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ CONFIG_MEMCG_SWAP=y
3131
CONFIG_BLK_CGROUP=y
3232
CONFIG_BLK_DEV_RBD=m
3333
CONFIG_CEPH_LIB=y
34+
CONFIG_CEPH_FS=m
35+
CONFIG_CEPH_FS_POSIX_ACL=y
3436
CONFIG_CGROUP_PIDS=y
3537
CONFIG_CGROUP_FREEZER=y
3638
CONFIG_CGROUP_HUGETLB=y

pkg/minikube/download/iso.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const fileScheme = "file"
4141
// DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
4242
func DefaultISOURLs() []string {
4343
v := version.GetISOVersion()
44-
isoBucket := "minikube-builds/iso/18375"
44+
isoBucket := "minikube-builds/iso/18213"
4545

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

0 commit comments

Comments
 (0)