diff --git a/Makefile b/Makefile index c7bb09fb9c4e..43d06499f2b4 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \" HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2) # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions -ISO_VERSION ?= v1.33.1-1716398070-18934 +ISO_VERSION ?= v1.33.1-1717022173-18858 # 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 index 44ce8d5d8156..1cfc07388868 100644 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig +++ b/deploy/iso/minikube-iso/board/minikube/aarch64/linux_aarch64_defconfig @@ -1284,3 +1284,11 @@ CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +CONFIG_SECURITY_APPARMOR_DEBUG=y +CONFIG_SECURITY_APPARMOR_DEBUG_ASSERTS=y +CONFIG_SECURITY_APPARMOR_DEBUG_MESSAGES=y +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor,bpf" 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 118d161e434a..4e24b00175ef 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 @@ -546,3 +546,11 @@ CONFIG_OPTIMIZE_INLINING=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_PROC_CHILDREN=y CONFIG_BINFMT_MISC=y +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +CONFIG_SECURITY_APPARMOR_DEBUG=y +CONFIG_SECURITY_APPARMOR_DEBUG_ASSERTS=y +CONFIG_SECURITY_APPARMOR_DEBUG_MESSAGES=y +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor,bpf" diff --git a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig index 3bc567b7f32f..9e6780f66f30 100644 --- a/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig @@ -3,6 +3,7 @@ BR2_aarch64=y # Toolchain BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y # System BR2_SYSTEM_DHCP="eth0" @@ -80,6 +81,8 @@ BR2_PACKAGE_XFSPROGS=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_SYSSTAT=y BR2_PACKAGE_LUAJIT=y +BR2_PACKAGE_PERL=y +BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LZ4_PROGS=y BR2_PACKAGE_CA_CERTIFICATES=y @@ -114,3 +117,7 @@ BR2_PACKAGE_HOST_PYTHON=y BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_PAHOLE=y BR2_PACKAGE_TBB=y +BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_BINUTILS=y +BR2_PACKAGE_APPARMOR_UTILS=y +BR2_PACKAGE_APPARMOR_UTILS_EXTRA=y diff --git a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig index 56219056f576..2ee420b29f07 100644 --- a/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig @@ -3,6 +3,7 @@ BR2_x86_64=y # Toolchain BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y # System BR2_SYSTEM_DHCP="eth0" @@ -80,6 +81,8 @@ BR2_PACKAGE_XFSPROGS=y BR2_PACKAGE_PARTED=y BR2_PACKAGE_SYSSTAT=y BR2_PACKAGE_LUAJIT=y +BR2_PACKAGE_PERL=y +BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_LZ4=y BR2_PACKAGE_LZ4_PROGS=y BR2_PACKAGE_CA_CERTIFICATES=y @@ -114,3 +117,7 @@ BR2_PACKAGE_HOST_PYTHON=y BR2_PACKAGE_LIBFUSE=y BR2_PACKAGE_PAHOLE=y BR2_PACKAGE_TBB=y +BR2_PACKAGE_APPARMOR=y +BR2_PACKAGE_APPARMOR_BINUTILS=y +BR2_PACKAGE_APPARMOR_UTILS=y +BR2_PACKAGE_APPARMOR_UTILS_EXTRA=y diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go index 989c6ddcc225..0ecf676d900e 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/18934" + isoBucket := "minikube-builds/iso/18858" return []string{ fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),