Merge pull request #15164 from brancz/patch-1

Add CONFIG_BPF_SYSCALL=y to aarch64 config
kubernetes · Jun 14, 2023 · abd35a5 · abd35a5
2 parents 7d83ccc + 7d2a343
commit abd35a5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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.30.1-1686592820-14689
+ISO_VERSION ?= v1.30.1-1686672019-15164
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig
@@ -5,6 +5,7 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_IKHEADERS=y
 CONFIG_BPF_LSM=y
+CONFIG_BPF_SYSCALL=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_FTRACE=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y

diff --git 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/14689"
+	isoBucket := "minikube-builds/iso/15164"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),