From 17b75d4620993ac298e969f8c5a1830fb53ecc6c Mon Sep 17 00:00:00 2001 From: Qiming Date: Tue, 27 Feb 2018 06:30:44 +0530 Subject: [PATCH] Document that Device Plugin feature is Beta (1.10) (#7512) --- docs/reference/feature-gates.md | 7 +++++++ docs/tasks/manage-gpus/scheduling-gpus.md | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/docs/reference/feature-gates.md b/docs/reference/feature-gates.md index 69f11b255a6d5..f5e32649d7977 100644 --- 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 index 5f548e435269b..52eb7c8199a66 100644 --- 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)).