From e864ce38a7ab953e149869a85a9c0d602652f8c4 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Thu, 5 Apr 2018 19:48:52 -0700
Subject: [PATCH] accelerators: remove Accelerators from feature gates

---
 .../layers/kubernetes-worker/reactive/kubernetes_worker.py    | 4 ++--
 cluster/kubemark/gce/config-default.sh                        | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
index 750aabb15d7..12a8105882e 100644
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -631,9 +631,9 @@ def configure_kubelet(dns, ingress_ip):
 
     if is_state('kubernetes-worker.gpu.enabled'):
         hookenv.log('Adding '
-                    '--feature-gates=Accelerators=true,DevicePlugins=true '
+                    '--feature-gates=DevicePlugins=true '
                     'to kubelet')
-        kubelet_opts['feature-gates'] = 'Accelerators=true,DevicePlugins=true'
+        kubelet_opts['feature-gates'] = 'DevicePlugins=true'
 
     configure_kubernetes_service('kubelet', kubelet_opts, 'kubelet-extra-args')
 
diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh
index 1e668ea53bd..34c1fa9dee2 100644
--- a/cluster/kubemark/gce/config-default.sh
+++ b/cluster/kubemark/gce/config-default.sh
@@ -120,10 +120,6 @@ fi
 # Optional: set feature gates
 FEATURE_GATES="${KUBE_FEATURE_GATES:-ExperimentalCriticalPodAnnotation=true}"
 
-if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
-    FEATURE_GATES="${FEATURE_GATES},Accelerators=true"
-fi
-
 # Enable a simple "AdvancedAuditing" setup for testing.
 ENABLE_APISERVER_ADVANCED_AUDIT="${ENABLE_APISERVER_ADVANCED_AUDIT:-false}"