Merge pull request #62346 from mindprince/automated-cherry-pick-of-#62209-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #62209: Add wildcard toleration to nvidia-gpu-device-plugin. Cherry pick of #62209 on release-1.10. #62209: Add wildcard toleration to nvidia-gpu-device-plugin.

Merge pull request #62346 from mindprince/automated-cherry-pick-of-#62209-upstream-release-1.10
baab3992 · Kubernetes Submit Queue · GitHub · e6805dc8 · f34bfb1e · baab3992
Unverified Commit baab3992 authored Apr 13, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

daemonset.yaml cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml +3 -2

No files found.
--- a/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml
+++ b/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml
@@ -23,9 +23,10 @@ spec:
              - key: cloud.google.com/gke-accelerator
                operator: Exists
      tolerations:
-      - key: "nvidia.com/gpu"
+      - operator: "Exists"
+        effect: "NoExecute"
+      - operator: "Exists"
        effect: "NoSchedule"
-        operator: "Exists"
      hostNetwork: true
      hostPID: true
      volumes: