Merge pull request #57384 from mindprince/deprecated-accelerators

Automatic merge from submit-queue (batch tested with PRs 56681, 57384). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Deprecate the alpha Accelerators feature gate. Encourage people to use DevicePlugins instead. /kind cleanup Related to https://github.com/kubernetes/features/issues/192 and https://github.com/kubernetes/features/issues/368 **Release note**: ```release-note The alpha Accelerators feature gate is deprecated and will be removed in v1.11. Please use device plugins instead. They can be enabled using the DevicePlugins feature gate. ``` /sig node /sig scheduling /area hw-accelerators

Merge pull request #57384 from mindprince/deprecated-accelerators
77069573 · Kubernetes Submit Queue · GitHub · c273ad5a · f52628db · 77069573
Unverified Commit 77069573 authored Dec 20, 2017 by Kubernetes Submit Queue Committed by GitHub Dec 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

kube_features.go pkg/features/kube_features.go +2 -0

kubelet.go pkg/kubelet/kubelet.go +1 -0

No files found.
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -64,6 +64,8 @@ const (
 	// owner: @vishh
 	// alpha: v1.6
 	//
+	// This is deprecated and will be removed in v1.11. Use DevicePlugins instead.
+	//
 	// Enables support for GPUs as a schedulable resource.
 	// Only Nvidia GPUs are supported as of v1.6.
 	// Works only with Docker Container Runtime.

--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -875,6 +875,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 	klet.softAdmitHandlers.AddPodAdmitHandler(lifecycle.NewNoNewPrivsAdmitHandler(klet.containerRuntime))
 	if utilfeature.DefaultFeatureGate.Enabled(features.Accelerators) {
 		if containerRuntime == kubetypes.DockerContainerRuntime {
+			glog.Warningln("Accelerators feature is deprecated and will be removed in v1.11. Please use device plugins instead. They can be enabled using the DevicePlugins feature gate.")
 			if klet.gpuManager, err = nvidia.NewNvidiaGPUManager(klet, kubeDeps.DockerClientConfig); err != nil {
 				return nil, err
 			}