Reorganize volume controllers and manager

This commit is contained in:
saadali
2016-07-01 18:50:25 -07:00
parent fb19362e01
commit 0dd17fff22
43 changed files with 42 additions and 33 deletions

View File

@@ -71,7 +71,7 @@ import (
"k8s.io/kubernetes/pkg/kubelet/util/format"
"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
"k8s.io/kubernetes/pkg/kubelet/util/queue"
kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volume"
"k8s.io/kubernetes/pkg/kubelet/volumemanager"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/securitycontext"
"k8s.io/kubernetes/pkg/types"
@@ -501,7 +501,7 @@ func NewMainKubelet(
return nil, err
}
klet.volumeManager, err = kubeletvolume.NewVolumeManager(
klet.volumeManager, err = volumemanager.NewVolumeManager(
enableControllerAttachDetach,
hostname,
klet.podManager,
@@ -687,7 +687,7 @@ type Kubelet struct {
// VolumeManager runs a set of asynchronous loops that figure out which
// volumes need to be attached/mounted/unmounted/detached based on the pods
// scheduled on this node and makes it so.
volumeManager kubeletvolume.VolumeManager
volumeManager volumemanager.VolumeManager
// Cloud provider interface.
cloud cloudprovider.Interface