Merge pull request #29234 from mtaufen/doublecode-volume-newmainkubelet

Automatic merge from submit-queue Remove duplicate code I think this code is wrongly duplicated. See #29233. Feel free to correct me if I am wrong.

Merge pull request #29234 from mtaufen/doublecode-volume-newmainkubelet
0b1f0e83 · k8s-merge-robot · GitHub · 7e0a6e49 · 1e13b9b2 · 0b1f0e83
Commit 0b1f0e83 authored Jul 21, 2016 by k8s-merge-robot Committed by GitHub Jul 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 15 deletions

kubelet.go pkg/kubelet/kubelet.go +0 -15

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -406,21 +406,6 @@ func NewMainKubelet(
 	klet.podCache = kubecontainer.NewCache()
 	klet.podManager = kubepod.NewBasicPodManager(kubepod.NewBasicMirrorClient(klet.kubeClient))

-	klet.volumePluginMgr, err =
-		NewInitializedVolumePluginMgr(klet, volumePlugins)
-	if err != nil {
-		return nil, err
-	}
-
-	klet.volumeManager, err = volumemanager.NewVolumeManager(
-		enableControllerAttachDetach,
-		hostname,
-		klet.podManager,
-		klet.kubeClient,
-		klet.volumePluginMgr,
-		klet.containerRuntime,
-		mounter)
-
 	// Initialize the runtime.
 	switch containerRuntime {
 	case "docker":