Merge pull request #322 from miaoyq/fix-314

Update kubernetes version to the PR#52395 and support `unconfined` apparmor
This commit is contained in:
Lantao Liu
2017-10-04 10:49:56 -07:00
committed by GitHub
8 changed files with 28 additions and 6 deletions

View File

@@ -809,6 +809,17 @@ func TestGenerateApparmorSpecOpts(t *testing.T) {
profile: "",
privileged: true,
},
"should not return error if apparmor is unconfined when apparmor is not supported": {
profile: unconfinedProfile,
disable: true,
},
"should not apparmor when apparmor is unconfined": {
profile: unconfinedProfile,
},
"should not apparmor when apparmor is unconfined and privileged is true": {
profile: unconfinedProfile,
privileged: true,
},
"should set default apparmor when apparmor is runtime/default": {
profile: runtimeDefault,
specOpts: apparmor.WithDefaultProfile(appArmorDefaultProfileName),