Skip to content

Commit 449a4a2

Browse files
authored
Merge pull request #26735 from liggitt/admission-alpha
Clarify stability level of admission plugins
2 parents 240251b + 4103230 commit 449a4a2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

content/en/docs/reference/access-authn-authz/admission-controllers.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,8 @@ Starting from 1.11, this admission controller is disabled by default.
565565

566566
### PodNodeSelector {#podnodeselector}
567567

568+
{{< feature-state for_k8s_version="v1.5" state="alpha" >}}
569+
568570
This admission controller defaults and limits what node selectors may be used within a namespace by reading a namespace annotation and a global configuration.
569571

570572
#### Configuration File Format
@@ -675,6 +677,8 @@ for more information.
675677

676678
### PodTolerationRestriction {#podtolerationrestriction}
677679

680+
{{< feature-state for_k8s_version="v1.7" state="alpha" >}}
681+
678682
The PodTolerationRestriction admission controller verifies any conflict between tolerations of a pod and the tolerations of its namespace.
679683
It rejects the pod request if there is a conflict.
680684
It then merges the tolerations annotated on the namespace into the tolerations of the pod.

0 commit comments

Comments
 (0)