Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit a68eab6

Browse files
author
Yanqiang Miao
committed
Support unconfined apparmor
Signed-off-by: Yanqiang Miao <[email protected]>
1 parent a7471d7 commit a68eab6

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

pkg/server/container_create.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -793,8 +793,7 @@ func generateApparmorSpecOpts(apparmorProf string, privileged, apparmorEnabled b
793793
case runtimeDefault:
794794
// TODO (mikebrow): delete created apparmor default profile
795795
return apparmor.WithDefaultProfile(appArmorDefaultProfileName), nil
796-
// TODO(random-liu): Should support "unconfined" after kubernetes#52395 lands.
797-
case "":
796+
case "", unconfinedProfile:
798797
// Based on kubernetes#51746, default apparmor profile should be applied
799798
// for non-privileged container when apparmor is not specified.
800799
if privileged {

pkg/server/container_create_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,19 @@ func TestGenerateApparmorSpecOpts(t *testing.T) {
805805
profile: "",
806806
privileged: true,
807807
},
808+
"should not return error if apparmor is unconfined when apparmor is not supported": {
809+
profile: unconfinedProfile,
810+
disable: true,
811+
expectErr: true,
812+
},
813+
"should set default apparmor when apparmor is unconfined": {
814+
profile: unconfinedProfile,
815+
specOpts: apparmor.WithDefaultProfile(appArmorDefaultProfileName),
816+
},
817+
"should not apparmor when apparmor is unconfined and privileged is true": {
818+
profile: unconfinedProfile,
819+
privileged: true,
820+
},
808821
"should set default apparmor when apparmor is runtime/default": {
809822
profile: runtimeDefault,
810823
specOpts: apparmor.WithDefaultProfile(appArmorDefaultProfileName),

0 commit comments

Comments
 (0)