From 7de3be69da84eacc7156d08bab2909a316cc8eb2 Mon Sep 17 00:00:00 2001 From: mattrobinsonsre <78958462+mattrobinsonsre@users.noreply.github.com> Date: Thu, 7 Sep 2023 08:44:34 +0100 Subject: [PATCH 1/3] Update linux_aarch64_defconfig to BPF support BPF support is missing from the arm64 kernel, which breaks for example cilium on that platform --- .../board/minikube/aarch64/linux_aarch64_defconfig | 6 ++++++ 1 file changed, 6 insertions(+) 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 6fc9139455bd..12351c7cefa2 100644 --- 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,9 @@ CONFIG_KVM_DEBUG_FS=y CONFIG_KVM_ARM=m CONFIG_PROC_CHILDREN=y CONFIG_BINFMT_MISC=y +CONFIG_NET_CLS_BPF=m +CONFIG_NET_ACT_BPF=m +CONFIG_BPF_JIT=y +CONFIG_BPF_LSM=y +CONFIG_BPF_SYSCALL=y +CONFIG_CGROUP_BPF=y From 6ecb12b39e9c62744424e5639d39c1deee31e500 Mon Sep 17 00:00:00 2001 From: mattrobinsonsre <78958462+mattrobinsonsre@users.noreply.github.com> Date: Wed, 11 Oct 2023 15:07:05 +0100 Subject: [PATCH 2/3] fix: additional kernel config for cilium --- .../minikube/aarch64/linux_aarch64_defconfig | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-) 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 12351c7cefa2..269aba8d12dd 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1241,9 +1241,41 @@ CONFIG_KVM_DEBUG_FS=y CONFIG_KVM_ARM=m CONFIG_PROC_CHILDREN=y CONFIG_BINFMT_MISC=y -CONFIG_NET_CLS_BPF=m -CONFIG_NET_ACT_BPF=m -CONFIG_BPF_JIT=y -CONFIG_BPF_LSM=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 From f478b3e95ad7f4002b1f24747b20ea33f6e08bc3 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 27 Nov 2023 22:59:31 +0000 Subject: [PATCH 3/3] Updating ISO to v1.32.1-1701107474-17206 --- Makefile | 2 +- pkg/minikube/download/iso.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7bc68adb54a0..cc1349d7819a 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.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/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 725ee955cfa3..39ca7fb7abf0 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/17634" + isoBucket := "minikube-builds/iso/17206" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),