Fixes #28643. Pass nodeName to VolumeManager instead of hostName.

This commit is contained in:
Dhawal Patel 2016-07-20 23:03:56 -07:00
parent 9ada26d6cd
commit 93fb8c93c9

View File

@ -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,