From 93fb8c93c9d68e4845dd10c286a5afaec5e9fb7d Mon Sep 17 00:00:00 2001 From: Dhawal Patel Date: Wed, 20 Jul 2016 23:03:56 -0700 Subject: [PATCH] Fixes #28643. Pass nodeName to VolumeManager instead of hostName. --- pkg/kubelet/kubelet.go | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index f6cf6134fef..11bf3a7369e 100644 --- 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": @@ -522,7 +507,7 @@ func NewMainKubelet( klet.volumeManager, err = volumemanager.NewVolumeManager( enableControllerAttachDetach, - hostname, + nodeName, klet.podManager, klet.kubeClient, klet.volumePluginMgr,