Skip to content

chore: use AppArmorProfile for cilium 1.16 #3371

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

Merged
merged 4 commits into from
Feb 21, 2025
Merged

chore: use AppArmorProfile for cilium 1.16 #3371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba4bc2b
set appArmorProfile and remove annotations for cilium 1.16
camrynl Jan 22, 2025
e97294f
set dualstack appArmorProfile
camrynl Jan 22, 2025
ddcde8c
set profile per container
camrynl Jan 23, 2025
c15b22e
update nightly daemonset
camrynl Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions test/integration/manifests/cilium/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ spec:
template:
metadata:
annotations:
container.apparmor.security.beta.kubernetes.io/apply-sysctl-overwrites: unconfined
container.apparmor.security.beta.kubernetes.io/cilium-agent: unconfined
container.apparmor.security.beta.kubernetes.io/clean-cilium-state: unconfined
container.apparmor.security.beta.kubernetes.io/mount-cgroup: unconfined
prometheus.io/port: "9962"
prometheus.io/scrape: "true"
creationTimestamp: null
Expand Down Expand Up @@ -102,6 +98,8 @@ spec:
timeoutSeconds: 5
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- CHOWN
Expand Down Expand Up @@ -197,6 +195,8 @@ spec:
name: mount-cgroup
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- SYS_ADMIN
Expand Down Expand Up @@ -229,6 +229,8 @@ spec:
name: apply-sysctl-overwrites
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- SYS_ADMIN
Expand Down Expand Up @@ -287,6 +289,8 @@ spec:
cpu: 100m
memory: 100Mi
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- NET_ADMIN
Expand Down
12 changes: 8 additions & 4 deletions test/integration/manifests/cilium/v1.16/cilium-agent/templates/daemonset-dualstack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ spec:
template:
metadata:
annotations:
container.apparmor.security.beta.kubernetes.io/apply-sysctl-overwrites: unconfined
container.apparmor.security.beta.kubernetes.io/cilium-agent: unconfined
container.apparmor.security.beta.kubernetes.io/clean-cilium-state: unconfined
container.apparmor.security.beta.kubernetes.io/mount-cgroup: unconfined
prometheus.io/port: "9962"
prometheus.io/scrape: "true"
creationTimestamp: null
Expand Down Expand Up @@ -97,6 +93,8 @@ spec:
timeoutSeconds: 5
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- CHOWN
Expand Down Expand Up @@ -192,6 +190,8 @@ spec:
name: mount-cgroup
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- SYS_ADMIN
Expand Down Expand Up @@ -224,6 +224,8 @@ spec:
name: apply-sysctl-overwrites
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- SYS_ADMIN
Expand Down Expand Up @@ -282,6 +284,8 @@ spec:
cpu: 100m
memory: 100Mi
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- NET_ADMIN
Expand Down
12 changes: 8 additions & 4 deletions test/integration/manifests/cilium/v1.16/cilium-agent/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ spec:
template:
metadata:
annotations:
container.apparmor.security.beta.kubernetes.io/apply-sysctl-overwrites: unconfined
container.apparmor.security.beta.kubernetes.io/cilium-agent: unconfined
container.apparmor.security.beta.kubernetes.io/clean-cilium-state: unconfined
container.apparmor.security.beta.kubernetes.io/mount-cgroup: unconfined
prometheus.io/port: "9962"
prometheus.io/scrape: "true"
creationTimestamp: null
Expand Down Expand Up @@ -97,6 +93,8 @@ spec:
timeoutSeconds: 5
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- CHOWN
Expand Down Expand Up @@ -192,6 +190,8 @@ spec:
name: mount-cgroup
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- SYS_ADMIN
Expand Down Expand Up @@ -224,6 +224,8 @@ spec:
name: apply-sysctl-overwrites
resources: {}
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- SYS_ADMIN
Expand Down Expand Up @@ -282,6 +284,8 @@ spec:
cpu: 100m
memory: 100Mi
securityContext:
appArmorProfile:
type: Unconfined
capabilities:
add:
- NET_ADMIN
Expand Down
Loading