Skip to content

Commit 4824a8b

Browse files
authored
chore: use AppArmorProfile for cilium 1.16 (#3371)
* set appArmorProfile and remove annotations for cilium 1.16 * set dualstack appArmorProfile * set profile per container * update nightly daemonset
1 parent 92f3817 commit 4824a8b

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

test/integration/manifests/cilium/daemonset.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ spec:
1616
template:
1717
metadata:
1818
annotations:
19-
container.apparmor.security.beta.kubernetes.io/apply-sysctl-overwrites: unconfined
20-
container.apparmor.security.beta.kubernetes.io/cilium-agent: unconfined
21-
container.apparmor.security.beta.kubernetes.io/clean-cilium-state: unconfined
22-
container.apparmor.security.beta.kubernetes.io/mount-cgroup: unconfined
2319
prometheus.io/port: "9962"
2420
prometheus.io/scrape: "true"
2521
creationTimestamp: null
@@ -102,6 +98,8 @@ spec:
10298
timeoutSeconds: 5
10399
resources: {}
104100
securityContext:
101+
appArmorProfile:
102+
type: Unconfined
105103
capabilities:
106104
add:
107105
- CHOWN
@@ -197,6 +195,8 @@ spec:
197195
name: mount-cgroup
198196
resources: {}
199197
securityContext:
198+
appArmorProfile:
199+
type: Unconfined
200200
capabilities:
201201
add:
202202
- SYS_ADMIN
@@ -229,6 +229,8 @@ spec:
229229
name: apply-sysctl-overwrites
230230
resources: {}
231231
securityContext:
232+
appArmorProfile:
233+
type: Unconfined
232234
capabilities:
233235
add:
234236
- SYS_ADMIN
@@ -287,6 +289,8 @@ spec:
287289
cpu: 100m
288290
memory: 100Mi
289291
securityContext:
292+
appArmorProfile:
293+
type: Unconfined
290294
capabilities:
291295
add:
292296
- NET_ADMIN

test/integration/manifests/cilium/v1.16/cilium-agent/templates/daemonset-dualstack.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ spec:
1717
template:
1818
metadata:
1919
annotations:
20-
container.apparmor.security.beta.kubernetes.io/apply-sysctl-overwrites: unconfined
21-
container.apparmor.security.beta.kubernetes.io/cilium-agent: unconfined
22-
container.apparmor.security.beta.kubernetes.io/clean-cilium-state: unconfined
23-
container.apparmor.security.beta.kubernetes.io/mount-cgroup: unconfined
2420
prometheus.io/port: "9962"
2521
prometheus.io/scrape: "true"
2622
creationTimestamp: null
@@ -97,6 +93,8 @@ spec:
9793
timeoutSeconds: 5
9894
resources: {}
9995
securityContext:
96+
appArmorProfile:
97+
type: Unconfined
10098
capabilities:
10199
add:
102100
- CHOWN
@@ -192,6 +190,8 @@ spec:
192190
name: mount-cgroup
193191
resources: {}
194192
securityContext:
193+
appArmorProfile:
194+
type: Unconfined
195195
capabilities:
196196
add:
197197
- SYS_ADMIN
@@ -224,6 +224,8 @@ spec:
224224
name: apply-sysctl-overwrites
225225
resources: {}
226226
securityContext:
227+
appArmorProfile:
228+
type: Unconfined
227229
capabilities:
228230
add:
229231
- SYS_ADMIN
@@ -282,6 +284,8 @@ spec:
282284
cpu: 100m
283285
memory: 100Mi
284286
securityContext:
287+
appArmorProfile:
288+
type: Unconfined
285289
capabilities:
286290
add:
287291
- NET_ADMIN

test/integration/manifests/cilium/v1.16/cilium-agent/templates/daemonset.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ spec:
1717
template:
1818
metadata:
1919
annotations:
20-
container.apparmor.security.beta.kubernetes.io/apply-sysctl-overwrites: unconfined
21-
container.apparmor.security.beta.kubernetes.io/cilium-agent: unconfined
22-
container.apparmor.security.beta.kubernetes.io/clean-cilium-state: unconfined
23-
container.apparmor.security.beta.kubernetes.io/mount-cgroup: unconfined
2420
prometheus.io/port: "9962"
2521
prometheus.io/scrape: "true"
2622
creationTimestamp: null
@@ -97,6 +93,8 @@ spec:
9793
timeoutSeconds: 5
9894
resources: {}
9995
securityContext:
96+
appArmorProfile:
97+
type: Unconfined
10098
capabilities:
10199
add:
102100
- CHOWN
@@ -192,6 +190,8 @@ spec:
192190
name: mount-cgroup
193191
resources: {}
194192
securityContext:
193+
appArmorProfile:
194+
type: Unconfined
195195
capabilities:
196196
add:
197197
- SYS_ADMIN
@@ -224,6 +224,8 @@ spec:
224224
name: apply-sysctl-overwrites
225225
resources: {}
226226
securityContext:
227+
appArmorProfile:
228+
type: Unconfined
227229
capabilities:
228230
add:
229231
- SYS_ADMIN
@@ -282,6 +284,8 @@ spec:
282284
cpu: 100m
283285
memory: 100Mi
284286
securityContext:
287+
appArmorProfile:
288+
type: Unconfined
285289
capabilities:
286290
add:
287291
- NET_ADMIN

0 commit comments

Comments
 (0)