Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add AppArmor Support #8299 #18858

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add AppArmor Support #8299 #18858

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e0c9cc8
add support for apparmor
nnzv May 12, 2024
a6103c8
Add Support For Apparmor (x86_64) #8299
nnzv May 12, 2024
c66cc13
Add Support For Apparmor (aarch64)
nnzv May 12, 2024
e64a71b
Merge branch 'kubernetes:master' into patch-apparmor
nnzv May 20, 2024
16527f5
Updating ISO to v1.33.1-1716226929-18858
minikube-bot May 20, 2024
0a9728b
Merge branch 'kubernetes:master' into patch-apparmor
nnzv May 23, 2024
494ee1d
iso: add apparmor kernel config
nnzv May 24, 2024
e109ed0
iso: add apparmor utils and extra utils
nnzv May 24, 2024
3841b3d
Updating ISO to v1.33.1-1716583330-18858
minikube-bot May 25, 2024
10e7038
Merge remote-tracking branch 'upstream/master' into patch-apparmor
nnzv May 29, 2024
43bd765
Updating ISO to v1.33.1-1717022173-18858
minikube-bot May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-1715968808-18896
ISO_VERSION ?= v1.33.1-1716226929-18858

# Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
Expand Down
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/configs/minikube_aarch64_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ BR2_aarch64=y

# Toolchain
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was enabling c++ libraries needed ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In menuconfig, under Target Packages -> Security, you'll find that you can't enable AppArmor until you meet some prerequisites, like enabling C++.

image


# System
BR2_SYSTEM_DHCP="eth0"
Expand Down Expand Up @@ -114,3 +115,4 @@ BR2_PACKAGE_HOST_PYTHON=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_PAHOLE=y
BR2_PACKAGE_TBB=y
BR2_PACKAGE_APPARMOR=y
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/configs/minikube_x86_64_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ BR2_x86_64=y

# Toolchain
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y

# System
BR2_SYSTEM_DHCP="eth0"
Expand Down Expand Up @@ -114,3 +115,4 @@ BR2_PACKAGE_HOST_PYTHON=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_PAHOLE=y
BR2_PACKAGE_TBB=y
BR2_PACKAGE_APPARMOR=y
2 changes: 1 addition & 1 deletion pkg/minikube/download/iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/18896"
isoBucket := "minikube-builds/iso/18858"

return []string{
fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),
Expand Down