Merge pull request #17206 from mattrobinsonsre/f-bpf-arm64

Update linux_aarch64_defconfig to add BPF support
kubernetes · Nov 28, 2023 · 1893a33 · 1893a33
2 parents d216473 + f478b3e
commit 1893a33
Show file tree

Hide file tree

Showing 3 changed files with 40 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.32.1-1700142131-17634
+ISO_VERSION ?= v1.32.1-1701107474-17206
 
 # 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
@@ -1241,3 +1241,41 @@ CONFIG_KVM_DEBUG_FS=y
 CONFIG_KVM_ARM=m
 CONFIG_PROC_CHILDREN=y
 CONFIG_BINFMT_MISC=y
+CONFIG_BPF=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_NET_CLS_BPF=y
+CONFIG_BPF_JIT=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_BPF=y
+CONFIG_PERF_EVENTS=y
+CONFIG_SCHEDSTATS=y
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_INET{,6}_ESP=m
+CONFIG_INET{,6}_IPCOMP=m
+CONFIG_INET{,6}_XFRM_TUNNEL=m
+CONFIG_INET{,6}_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_AES=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_CORE=y # Needed for vxlan
+CONFIG_VXLAN=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_MULTIPLE_TABLES=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/17634"
+	isoBucket := "minikube-builds/iso/17206"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),