Document that Device Plugin feature is Beta (1.10) (#7512)

kubernetes · Apr 16, 2018 · 17b75d4 · 17b75d4
1 parent cc22392
commit 17b75d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md
@@ -54,9 +54,16 @@ different Kubernetes components.
 | `CustomResourceSubresources` | `false` | Alpha | 1.10 | |
 | `CustomResourceValidation` | `false` | Alpha | 1.8 | 1.8 |
 | `CustomResourceValidation` | `true` | Beta | 1.9 | |
+<<<<<<< HEAD
 | `DebugContainers` | `false` | Alpha | 1.10 | |
 | `DevicePlugins` | `false` | Alpha | 1.8 | 1.9 |
 | `DevicePlugins` | `true` | Beta | 1.10 | |
+||||||| merged common ancestors
+| `DevicePlugins` | `false` | Alpha | 1.8 | |
+=======
+| `DevicePlugins` | `false` | Alpha | 1.8 | 1.9 |
+| `DevicePlugins` | `true` | Beta | 1.10 | |
+>>>>>>> Document that Device Plugin feature is Beta (1.10) (#7512)
 | `DynamicKubeletConfig` | `false` | Alpha | 1.4 | |
 | `DynamicVolumeProvisioning` | `true` | Alpha | 1.3 | 1.7 |
 | `DynamicVolumeProvisioning` | `true` | GA | 1.8 | |

diff --git a/docs/tasks/manage-gpus/scheduling-gpus.md b/docs/tasks/manage-gpus/scheduling-gpus.md
@@ -14,10 +14,21 @@ consume GPUs across different Kubernetes versions and the current limitations.
 **From 1.8 onwards, the recommended way to consume GPUs is to use [device
 plugins](/docs/concepts/cluster-administration/device-plugins).**
 
+<<<<<<< HEAD
 To enable GPU support through device plugins before 1.10, the `DevicePlugins`
 feature gate has to be explicitly set to true across the system:
 `--feature-gates="DevicePlugins=true"`. This is no longer required starting
 from 1.10.
+||||||| merged common ancestors
+To enable GPU support through device plugins, a special **alpha** feature gate
+`DevicePlugins` has to be set to true across the system:
+`--feature-gates="DevicePlugins=true"`.
+=======
+To enable GPU support through device plugins before 1,10, the `DevicePlugins`
+feature gate has to be explicitly set to true across the system:
+`--feature-gates="DevicePlugins=true"`. This is no longer required starting
+from 1.10.
+>>>>>>> Document that Device Plugin feature is Beta (1.10) (#7512)
 
 Then you have to install NVIDIA drivers on the nodes and run an NVIDIA GPU device
 plugin ([see below](#deploying-nvidia-gpu-device-plugin)).