Merge pull request #62187 from mikedanese/cluster

Automatic merge from submit-queue. 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>. accelerators: remove Accelerators from feature gates Passing this flag is preventing clusters from coming up: ``` server.go:165] unrecognized key: Accelerators ```

Merge pull request #62187 from mikedanese/cluster
44ffcdd9 · Kubernetes Submit Queue · GitHub · 5898d591 · e864ce38 · 44ffcdd9
Unverified Commit 44ffcdd9 authored Apr 06, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +2 -2

config-default.sh cluster/kubemark/gce/config-default.sh +0 -4

No files found.
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -634,9 +634,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')


--- 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}"