From c812f50585dfdd76b314e2519b23baf81d809b20 Mon Sep 17 00:00:00 2001 From: Qiming Date: Wed, 23 May 2018 23:49:32 +0800 Subject: [PATCH] CRIContainerLogRotation is Beta in 1.11 (#8665) * Seperate priority and preemption (#8144) * CRIContainerLogRotation is Beta in 1.11 xref: kubernetes/kubernetes#64046 --- .../en/docs/concepts/configuration/pod-priority-preemption.md | 1 - .../reference/command-line-tools-reference/feature-gates.md | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/docs/concepts/configuration/pod-priority-preemption.md b/content/en/docs/concepts/configuration/pod-priority-preemption.md index 98e48a1405f72..e04be6d64f79d 100644 --- a/content/en/docs/concepts/configuration/pod-priority-preemption.md +++ b/content/en/docs/concepts/configuration/pod-priority-preemption.md @@ -79,7 +79,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 index 821c5dc3473e4..3fdeca436abf2 100644 --- 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 |