CRIContainerLogRotation is Beta in 1.11 (kubernetes#8665)

* Seperate priority and preemption (kubernetes#8144) * CRIContainerLogRotation is Beta in 1.11 xref: kubernetes/kubernetes#64046
k82cn · Jun 11, 2018 · d6c76e5 · d6c76e5
1 parent bc4da9b
commit d6c76e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/content/en/docs/concepts/configuration/pod-priority-preemption.md b/content/en/docs/concepts/configuration/pod-priority-preemption.md
@@ -78,7 +78,6 @@ disablePreemption: true
 
 Please note: although preemption of scheduler is enabled by default, preemption will not happen if `PodPriority` feature is not available.
 
-
 ## PriorityClass
 
 A PriorityClass is a non-namespaced object that defines a mapping from a priority

diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates.md b/content/en/docs/reference/command-line-tools-reference/feature-gates.md
@@ -38,7 +38,8 @@ different Kubernetes components.
 | `BlockVolume` | `false` | Alpha | 1.9 | |
 | `CPUManager` | `false` | Alpha | 1.8 | 1.9 |
 | `CPUManager` | `true` | Beta | 1.10 | |
-| `CRIContainerLogRotation` | `false` | Alpha | 1.10 | |
+| `CRIContainerLogRotation` | `false` | Alpha | 1.10 | 1.10 |
+| `CRIContainerLogRotation` | `true` | Beta| 1.11 | |
 | `CSIPersistentVolume` | `false` | Alpha | 1.9 | 1.9 |
 | `CSIPersistentVolume` | `true` | Beta | 1.10 | |
 | `CustomPodDNS` | `false` | Alpha | 1.9 | 1.9 |