From 08d63f2295cc5815eefa7e33939f6658d62737cd Mon Sep 17 00:00:00 2001 From: Qiming Date: Mon, 5 Mar 2018 23:34:53 +0800 Subject: [PATCH] Document that LocalStorageCapacityIsolation is beta (#7635) A follow-up to the kubernetes/kubernetes#60159 change which has promoted the `LocalStorageCapacityIsolation` feature gate to Beta. --- docs/reference/feature-gates.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md index 2ce5abb1eb..775b5e78da 100644 --- a/docs/reference/feature-gates.md +++ b/docs/reference/feature-gates.md @@ -102,8 +102,15 @@ different Kubernetes components. | `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | | ======= | `KubeletConfigFile` | `false` | Alpha | 1.8 | 1.9 | +<<<<<<< HEAD | `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | | >>>>>>> Document the removal of the KubeletConfigFile feature gate (#7140) +||||||| merged common ancestors +| `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | | +======= +| `LocalStorageCapacityIsolation` | `false` | Alpha | 1.7 | 1.9 | +| `LocalStorageCapacityIsolation` | `true` | Beta| 1.10 | | +>>>>>>> Document that LocalStorageCapacityIsolation is beta (#7635) | `MountContainers` | `false` | Alpha | 1.9 | | | `MountPropagation` | `false` | Alpha | 1.8 | 1.9 | | `MountPropagation` | `true` | Beta | 1.10 | |