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

Merge pull request #38431 from NickrenREN/newVolumeMgr-return

Browse Source 
Automatic merge from submit-queue

Modify NewVolumeManager() function return value
This commit is contained in:
Kubernetes Submit Queue 2017-06-22 16:43:29 -07:00 committed by GitHub
commit dd126ae19c
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

@ -743,7 +743,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub
kubeCfg.ExperimentalCheckNodeCapabilitiesBeforeMount = false kubeCfg.ExperimentalCheckNodeCapabilitiesBeforeMount = false
} }
// setup volumeManager // setup volumeManager
klet.volumeManager, err = volumemanager.NewVolumeManager( klet.volumeManager = volumemanager.NewVolumeManager(
kubeCfg.EnableControllerAttachDetach, kubeCfg.EnableControllerAttachDetach,
nodeName, nodeName,
klet.podManager, klet.podManager,

3
pkg/kubelet/kubelet_test.go
View File

@ -283,7 +283,7 @@ func newTestKubeletWithImageList(
require.NoError(t, err, "Failed to initialize VolumePluginMgr") require.NoError(t, err, "Failed to initialize VolumePluginMgr")
kubelet.mounter = &mount.FakeMounter{} kubelet.mounter = &mount.FakeMounter{}
kubelet.volumeManager, err = kubeletvolume.NewVolumeManager( kubelet.volumeManager = kubeletvolume.NewVolumeManager(
controllerAttachDetachEnabled, controllerAttachDetachEnabled,
kubelet.nodeName, kubelet.nodeName,
kubelet.podManager, kubelet.podManager,
@ -296,7 +296,6 @@ func newTestKubeletWithImageList(
kubelet.recorder, kubelet.recorder,
false, /* experimentalCheckNodeCapabilitiesBeforeMount*/ false, /* experimentalCheckNodeCapabilitiesBeforeMount*/
false /* keepTerminatedPodVolumes */) false /* keepTerminatedPodVolumes */)
require.NoError(t, err, "Failed to initialize volume manager")
// enable active deadline handler // enable active deadline handler
activeDeadlineHandler, err := newActiveDeadlineHandler(kubelet.statusManager, kubelet.recorder, kubelet.clock) activeDeadlineHandler, err := newActiveDeadlineHandler(kubelet.statusManager, kubelet.recorder, kubelet.clock)

2
pkg/kubelet/runonce_test.go
View File

@ -99,7 +99,7 @@ func TestRunOnce(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("failed to initialize VolumePluginMgr: %v", err) t.Fatalf("failed to initialize VolumePluginMgr: %v", err)
} }
kb.volumeManager, err = volumemanager.NewVolumeManager( kb.volumeManager = volumemanager.NewVolumeManager(
true, true,
kb.nodeName, kb.nodeName,
kb.podManager, kb.podManager,

4
pkg/kubelet/volumemanager/volume_manager.go
View File

@ -156,7 +156,7 @@ func NewVolumeManager(
kubeletPodsDir string, kubeletPodsDir string,
recorder record.EventRecorder, recorder record.EventRecorder,
checkNodeCapabilitiesBeforeMount bool, checkNodeCapabilitiesBeforeMount bool,
keepTerminatedPodVolumes bool) (VolumeManager, error) { keepTerminatedPodVolumes bool) VolumeManager {
vm := &volumeManager{ vm := &volumeManager{
kubeClient: kubeClient, kubeClient: kubeClient,
@ -195,7 +195,7 @@ func NewVolumeManager(
volumePluginMgr, volumePluginMgr,
kubeletPodsDir) kubeletPodsDir)
return vm, nil return vm
} }
// volumeManager implements the VolumeManager interface // volumeManager implements the VolumeManager interface

17
pkg/kubelet/volumemanager/volume_manager_test.go
View File

@ -61,10 +61,7 @@ func TestGetMountedVolumesForPodAndGetVolumesInUse(t *testing.T) {
node, pod, pv, claim := createObjects() node, pod, pv, claim := createObjects()
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim) kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
manager, err := newTestVolumeManager(tmpDir, podManager, kubeClient) manager := newTestVolumeManager(tmpDir, podManager, kubeClient)
if err != nil {
t.Fatalf("Failed to initialize volume manager: %v", err)
}
stopCh := runVolumeManager(manager) stopCh := runVolumeManager(manager)
defer close(stopCh) defer close(stopCh)
@ -150,11 +147,7 @@ func TestGetExtraSupplementalGroupsForPod(t *testing.T) {
} }
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim) kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
manager, err := newTestVolumeManager(tmpDir, podManager, kubeClient) manager := newTestVolumeManager(tmpDir, podManager, kubeClient)
if err != nil {
t.Errorf("Failed to initialize volume manager: %v", err)
continue
}
stopCh := runVolumeManager(manager) stopCh := runVolumeManager(manager)
defer func() { defer func() {
@ -182,14 +175,14 @@ func TestGetExtraSupplementalGroupsForPod(t *testing.T) {
} }
} }
func newTestVolumeManager(tmpDir string, podManager pod.Manager, kubeClient clientset.Interface) (VolumeManager, error) { func newTestVolumeManager(tmpDir string, podManager pod.Manager, kubeClient clientset.Interface) VolumeManager {
plug := &volumetest.FakeVolumePlugin{PluginName: "fake", Host: nil} plug := &volumetest.FakeVolumePlugin{PluginName: "fake", Host: nil}
fakeRecorder := &record.FakeRecorder{} fakeRecorder := &record.FakeRecorder{}
plugMgr := &volume.VolumePluginMgr{} plugMgr := &volume.VolumePluginMgr{}
plugMgr.InitPlugins([]volume.VolumePlugin{plug}, volumetest.NewFakeVolumeHost(tmpDir, kubeClient, nil)) plugMgr.InitPlugins([]volume.VolumePlugin{plug}, volumetest.NewFakeVolumeHost(tmpDir, kubeClient, nil))
statusManager := status.NewManager(kubeClient, podManager, &statustest.FakePodDeletionSafetyProvider{}) statusManager := status.NewManager(kubeClient, podManager, &statustest.FakePodDeletionSafetyProvider{})
vm, err := NewVolumeManager( vm := NewVolumeManager(
true, true,
testHostname, testHostname,
podManager, podManager,
@ -203,7 +196,7 @@ func newTestVolumeManager(tmpDir string, podManager pod.Manager, kubeClient clie
false, /* experimentalCheckNodeCapabilitiesBeforeMount */ false, /* experimentalCheckNodeCapabilitiesBeforeMount */
false /* keepTerminatedPodVolumes */) false /* keepTerminatedPodVolumes */)
return vm, err return vm
} }
// createObjects returns objects for making a fake clientset. The pv is // createObjects returns objects for making a fake clientset. The pv is