github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07: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
parent 886e04f1ff 312cd1bbe6
commit dd126ae19c
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet_test.go
View File

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