github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dhawal Patel 2016-07-20 23:03:56 -07:00
parent 9ada26d6cd
commit 93fb8c93c9
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubelet/kubelet.go
View File

@ -406,21 +406,6 @@ func NewMainKubelet(
klet.podCache = kubecontainer.NewCache() klet.podCache = kubecontainer.NewCache()
klet.podManager = kubepod.NewBasicPodManager(kubepod.NewBasicMirrorClient(klet.kubeClient)) 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. // Initialize the runtime.
switch containerRuntime { switch containerRuntime {
case "docker": case "docker":
@ -522,7 +507,7 @@ func NewMainKubelet(
klet.volumeManager, err = volumemanager.NewVolumeManager( klet.volumeManager, err = volumemanager.NewVolumeManager(
enableControllerAttachDetach, enableControllerAttachDetach,
hostname, nodeName,
klet.podManager, klet.podManager,
klet.kubeClient, klet.kubeClient,
klet.volumePluginMgr, klet.volumePluginMgr,