From 0194cc3582ecd25a736ac3660bc9effa677f982b Mon Sep 17 00:00:00 2001 From: Francis Laniel Date: Mon, 10 Oct 2022 19:19:11 +0200 Subject: [PATCH] Add FANOTIFY_ACCESS_PERMISSIONS to kernel configs. This options enables fanotify to make permissions decisions on filesystem events. Signed-off-by: Francis Laniel --- Makefile | 2 +- .../minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig | 1 + .../minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig | 1 + pkg/minikube/download/iso.go | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7a3e2c60c4..5a5e8cd7f6 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.27.0-1666206003-15159 +ISO_VERSION ?= v1.27.0-1666976405-15232 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta DEB_VERSION ?= $(subst -,~,$(RAW_VERSION)) DEB_REVISION ?= 0 diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig index 0878f94b9b..93713e9e5e 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1,4 +1,5 @@ CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_KPROBE_EVENTS=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_BTF=y diff --git a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig index 239ed81798..5867ca030b 100644 --- a/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/x86_64/linux_x86_64_defconfig @@ -1,4 +1,5 @@ CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_KPROBE_EVENTS=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_BTF=y diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index d1f3ae335e..4c26db9f5a 100644 --- a/pkg/minikube/download/iso.go +++ b/pkg/minikube/download/iso.go @@ -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/15159" + isoBucket := "minikube-builds/iso/15232" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH), fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s-%s.iso", v, v, runtime.GOARCH),