Skip to content

Commit

Permalink
CRIContainerLogRotation is Beta in 1.11 (#8665)
Browse files Browse the repository at this point in the history
* Seperate priority and preemption (#8144)

* CRIContainerLogRotation is Beta in 1.11

xref: kubernetes/kubernetes#64046
  • Loading branch information
tengqm authored and k8s-ci-robot committed May 23, 2018
1 parent 462adb8 commit 5647835
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion content/en/docs/reference/feature-gates.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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 |
Expand Down

0 comments on commit 5647835

Please sign in to comment.