github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62187 from mikedanese/cluster

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2018-04-06 00:11:09 -07:00 committed by GitHub
commit 44ffcdd9c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -634,9 +634,9 @@ def configure_kubelet(dns, ingress_ip):
if is_state('kubernetes-worker.gpu.enabled'): if is_state('kubernetes-worker.gpu.enabled'):
hookenv.log('Adding ' hookenv.log('Adding '
'--feature-gates=Accelerators=true,DevicePlugins=true ' '--feature-gates=DevicePlugins=true '
'to kubelet') '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') configure_kubernetes_service('kubelet', kubelet_opts, 'kubelet-extra-args')

4
cluster/kubemark/gce/config-default.sh
View File

@ -120,10 +120,6 @@ fi
# Optional: set feature gates # Optional: set feature gates
FEATURE_GATES="${KUBE_FEATURE_GATES:-ExperimentalCriticalPodAnnotation=true}" 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 a simple "AdvancedAuditing" setup for testing.
ENABLE_APISERVER_ADVANCED_AUDIT="${ENABLE_APISERVER_ADVANCED_AUDIT:-false}" ENABLE_APISERVER_ADVANCED_AUDIT="${ENABLE_APISERVER_ADVANCED_AUDIT:-false}"