Skip to content

Commit 1893a33

Browse files
authored
Merge pull request #17206 from mattrobinsonsre/f-bpf-arm64
Update linux_aarch64_defconfig to add BPF support
2 parents d216473 + f478b3e commit 1893a33

File tree

3 files changed

+40
-2
lines changed

3 files changed

+40
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
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.32.1-1700142131-17634
26+
ISO_VERSION ?= v1.32.1-1701107474-17206
2727

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

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,3 +1241,41 @@ CONFIG_KVM_DEBUG_FS=y
12411241
CONFIG_KVM_ARM=m
12421242
CONFIG_PROC_CHILDREN=y
12431243
CONFIG_BINFMT_MISC=y
1244+
CONFIG_BPF=y
1245+
CONFIG_BPF_SYSCALL=y
1246+
CONFIG_NET_CLS_BPF=y
1247+
CONFIG_BPF_JIT=y
1248+
CONFIG_NET_CLS_ACT=y
1249+
CONFIG_NET_SCH_INGRESS=y
1250+
CONFIG_CRYPTO_SHA1=y
1251+
CONFIG_CRYPTO_USER_API_HASH=y
1252+
CONFIG_CGROUPS=y
1253+
CONFIG_CGROUP_BPF=y
1254+
CONFIG_PERF_EVENTS=y
1255+
CONFIG_SCHEDSTATS=y
1256+
CONFIG_NETFILTER_XT_TARGET_CT=m
1257+
CONFIG_XFRM=y
1258+
CONFIG_XFRM_OFFLOAD=y
1259+
CONFIG_XFRM_STATISTICS=y
1260+
CONFIG_XFRM_ALGO=m
1261+
CONFIG_XFRM_USER=m
1262+
CONFIG_INET{,6}_ESP=m
1263+
CONFIG_INET{,6}_IPCOMP=m
1264+
CONFIG_INET{,6}_XFRM_TUNNEL=m
1265+
CONFIG_INET{,6}_TUNNEL=m
1266+
CONFIG_INET_XFRM_MODE_TUNNEL=m
1267+
CONFIG_CRYPTO_AEAD=m
1268+
CONFIG_CRYPTO_AEAD2=m
1269+
CONFIG_CRYPTO_GCM=m
1270+
CONFIG_CRYPTO_SEQIV=m
1271+
CONFIG_CRYPTO_CBC=m
1272+
CONFIG_CRYPTO_HMAC=m
1273+
CONFIG_CRYPTO_SHA256=m
1274+
CONFIG_CRYPTO_AES=m
1275+
CONFIG_NET_SCH_FQ=m
1276+
CONFIG_NET_CORE=y # Needed for vxlan
1277+
CONFIG_VXLAN=y
1278+
CONFIG_IP_ADVANCED_ROUTER=y
1279+
CONFIG_IP_ROUTE_MULTIPATH=y
1280+
CONFIG_IP_MULTICAST=y
1281+
CONFIG_IP_MULTIPLE_TABLES=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/17634"
44+
isoBucket := "minikube-builds/iso/17206"
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)