Use PSP from policy API group. (#7562)

kubernetes · Apr 16, 2018 · 8a93b31 · 8a93b31
1 parent b4ccb71
commit 8a93b31
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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: