From 8a93b3165599f01544685acf6bd6ae2161c33413 Mon Sep 17 00:00:00 2001 From: Vyacheslav Semushin Date: Sat, 3 Mar 2018 20:47:53 +0100 Subject: [PATCH] Use PSP from policy API group. (#7562) --- docs/tutorials/clusters/apparmor.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/tutorials/clusters/apparmor.md b/docs/tutorials/clusters/apparmor.md index 4f8ecca519..d54442d0de 100644 --- a/docs/tutorials/clusters/apparmor.md +++ b/docs/tutorials/clusters/apparmor.md @@ -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`: ``` +<<<<<<< HEAD --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: