Skip to content

Commit f6b1ad1

Browse files
authored
Merge pull request #35610 from sftim/20220801_update_psp_docs
Update PodSecurityPolicy annotation details for v1.25
2 parents 4eb1ad3 + 2d03570 commit f6b1ad1

File tree

1 file changed

+7
-4
lines changed
  • content/en/docs/reference/labels-annotations-taints

1 file changed

+7
-4
lines changed

content/en/docs/reference/labels-annotations-taints/_index.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,11 +622,14 @@ for more information.
622622

623623
Example: `kubernetes.io/psp: restricted`
624624

625-
This annotation is only relevant if you are using [PodSecurityPolicies](/docs/concepts/security/pod-security-policy/).
625+
Used on: Pod
626+
627+
This annotation was only relevant if you were using [PodSecurityPolicies](/docs/concepts/security/pod-security-policy/).
628+
Kubernetes v{{< skew currentVersion >}} does not support the PodSecurityPolicy API.
626629

627-
When the PodSecurityPolicy admission controller admits a Pod, the admission controller
628-
modifies the Pod to have this annotation.
629-
The value of the annotation is the name of the PodSecurityPolicy that was used for validation.
630+
When the PodSecurityPolicy admission controller admitted a Pod, the admission controller
631+
modified the Pod to have this annotation.
632+
The value of the annotation was the name of the PodSecurityPolicy that was used for validation.
630633

631634
### seccomp.security.alpha.kubernetes.io/pod (deprecated) {#seccomp-security-alpha-kubernetes-io-pod}
632635

0 commit comments

Comments
 (0)