Merge pull request #64478 from…

Merge pull request #64478 from jiayingz/automated-cherry-pick-of-#64296-#64340-#64404-upstream-release-1.10 Automatic merge from submit-queue. Automated cherry pick of #64296: Update nvidia-gpu-device-plugin to apps/v1 and use #64340: Fix DsFromManifest() after we switch from extensions/v1beta1 #64404: DaemonSet internals are still in extensions Cherry pick of #64296 #64340 #64404 on release-1.10. #64296: Update nvidia-gpu-device-plugin to apps/v1 and use #64340: Fix DsFromManifest() after we switch from extensions/v1beta1 #64404: DaemonSet internals are still in extensions ```release-note Fix nvidia-gpu-device-plugin DaemonSet config to ensure correct device plugin upgrade ```

Merge pull request #64478 from…
4d9a60b0 · Kubernetes Submit Queue · GitHub · 8af495e9 · a14049ac · 4d9a60b0
Unverified Commit 4d9a60b0 authored May 30, 2018 by Kubernetes Submit Queue Committed by GitHub May 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

daemonset.yaml cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml +6 -1

util.go test/e2e/framework/util.go +2 -2

nvidia-gpus.go test/e2e/scheduling/nvidia-gpus.go +1 -1

No files found.
--- a/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml
+++ b/cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
  name: nvidia-gpu-device-plugin
@@ -7,6 +7,9 @@ metadata:
    k8s-app: nvidia-gpu-device-plugin
    addonmanager.kubernetes.io/mode: Reconcile
 spec:
+  selector:
+    matchLabels:
+      k8s-app: nvidia-gpu-device-plugin
  template:
    metadata:
      labels:
@@ -54,3 +57,5 @@ spec:
          mountPath: /device-plugin
        - name: dev
          mountPath: /dev
+  updateStrategy:
+    type: RollingUpdate
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -5162,8 +5162,8 @@ func DumpDebugInfo(c clientset.Interface, ns string) {
 }
 // DsFromManifest reads a .json/yaml file and returns the daemonset in it.
-func DsFromManifest(url string) (*extensions.DaemonSet, error) {
+func DsFromManifest(url string) (*apps.DaemonSet, error) {
-	var controller extensions.DaemonSet
+	var controller apps.DaemonSet
 	Logf("Parsing ds from %v", url)
 	var response *http.Response

--- a/test/e2e/scheduling/nvidia-gpus.go
+++ b/test/e2e/scheduling/nvidia-gpus.go
@@ -183,7 +183,7 @@ func SetupNVIDIAGPUNode(f *framework.Framework, setupResourceGatherer bool) *fra
 	ds, err := framework.DsFromManifest(dsYamlUrl)
 	Expect(err).NotTo(HaveOccurred())
 	ds.Namespace = f.Namespace.Name
-	_, err = f.ClientSet.ExtensionsV1beta1().DaemonSets(f.Namespace.Name).Create(ds)
+	_, err = f.ClientSet.AppsV1().DaemonSets(f.Namespace.Name).Create(ds)
 	framework.ExpectNoError(err, "failed to create nvidia-driver-installer daemonset")
 	framework.Logf("Successfully created daemonset to install Nvidia drivers.")