whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use PSP from policy API group. (#7562)

Browse Source
This commit is contained in:
Vyacheslav Semushin
2018-03-03 20:47:53 +01:00
committed by zacharysarah
parent b4ccb71c3b
commit 8a93b31655
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tutorials/clusters/apparmor.md
+7
View File
@@ -320,7 +320,14 @@ If the PodSecurityPolicy extension is enabled, cluster-wide AppArmor restriction
enable the PodSecurityPolicy, the following flag must be set on the `apiserver`: enable the PodSecurityPolicy, the following flag must be set on the `apiserver`:
``` ```
<<<<<<< HEAD
--enable-admission-plugins=PodSecurityPolicy[,others...] --enable-admission-plugins=PodSecurityPolicy[,others...]
||||||| merged common ancestors
--admission-control=PodSecurityPolicy[,others...]
--runtime-config=extensions/v1beta1/podsecuritypolicy[,others...]
=======
--admission-control=PodSecurityPolicy[,others...]
>>>>>>> Use PSP from policy API group. (#7562)
``` ```
The AppArmor options can be specified as annotations on the PodSecurityPolicy: The AppArmor options can be specified as annotations on the PodSecurityPolicy: