mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #38431 from NickrenREN/newVolumeMgr-return
Automatic merge from submit-queue Modify NewVolumeManager() function return value
This commit is contained in:
commit
dd126ae19c
@ -743,7 +743,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub
|
||||
kubeCfg.ExperimentalCheckNodeCapabilitiesBeforeMount = false
|
||||
}
|
||||
// setup volumeManager
|
||||
klet.volumeManager, err = volumemanager.NewVolumeManager(
|
||||
klet.volumeManager = volumemanager.NewVolumeManager(
|
||||
kubeCfg.EnableControllerAttachDetach,
|
||||
nodeName,
|
||||
klet.podManager,
|
||||
|
@ -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)
|
||||
|
@ -99,7 +99,7 @@ func TestRunOnce(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatalf("failed to initialize VolumePluginMgr: %v", err)
|
||||
}
|
||||
kb.volumeManager, err = volumemanager.NewVolumeManager(
|
||||
kb.volumeManager = volumemanager.NewVolumeManager(
|
||||
true,
|
||||
kb.nodeName,
|
||||
kb.podManager,
|
||||
|
@ -156,7 +156,7 @@ func NewVolumeManager(
|
||||
kubeletPodsDir string,
|
||||
recorder record.EventRecorder,
|
||||
checkNodeCapabilitiesBeforeMount bool,
|
||||
keepTerminatedPodVolumes bool) (VolumeManager, error) {
|
||||
keepTerminatedPodVolumes bool) VolumeManager {
|
||||
|
||||
vm := &volumeManager{
|
||||
kubeClient: kubeClient,
|
||||
@ -195,7 +195,7 @@ func NewVolumeManager(
|
||||
volumePluginMgr,
|
||||
kubeletPodsDir)
|
||||
|
||||
return vm, nil
|
||||
return vm
|
||||
}
|
||||
|
||||
// volumeManager implements the VolumeManager interface
|
||||
|
@ -61,10 +61,7 @@ func TestGetMountedVolumesForPodAndGetVolumesInUse(t *testing.T) {
|
||||
node, pod, pv, claim := createObjects()
|
||||
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
||||
|
||||
manager, err := newTestVolumeManager(tmpDir, podManager, kubeClient)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to initialize volume manager: %v", err)
|
||||
}
|
||||
manager := newTestVolumeManager(tmpDir, podManager, kubeClient)
|
||||
|
||||
stopCh := runVolumeManager(manager)
|
||||
defer close(stopCh)
|
||||
@ -150,11 +147,7 @@ func TestGetExtraSupplementalGroupsForPod(t *testing.T) {
|
||||
}
|
||||
kubeClient := fake.NewSimpleClientset(node, pod, pv, claim)
|
||||
|
||||
manager, err := newTestVolumeManager(tmpDir, podManager, kubeClient)
|
||||
if err != nil {
|
||||
t.Errorf("Failed to initialize volume manager: %v", err)
|
||||
continue
|
||||
}
|
||||
manager := newTestVolumeManager(tmpDir, podManager, kubeClient)
|
||||
|
||||
stopCh := runVolumeManager(manager)
|
||||
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}
|
||||
fakeRecorder := &record.FakeRecorder{}
|
||||
plugMgr := &volume.VolumePluginMgr{}
|
||||
plugMgr.InitPlugins([]volume.VolumePlugin{plug}, volumetest.NewFakeVolumeHost(tmpDir, kubeClient, nil))
|
||||
statusManager := status.NewManager(kubeClient, podManager, &statustest.FakePodDeletionSafetyProvider{})
|
||||
|
||||
vm, err := NewVolumeManager(
|
||||
vm := NewVolumeManager(
|
||||
true,
|
||||
testHostname,
|
||||
podManager,
|
||||
@ -203,7 +196,7 @@ func newTestVolumeManager(tmpDir string, podManager pod.Manager, kubeClient clie
|
||||
false, /* experimentalCheckNodeCapabilitiesBeforeMount */
|
||||
false /* keepTerminatedPodVolumes */)
|
||||
|
||||
return vm, err
|
||||
return vm
|
||||
}
|
||||
|
||||
// createObjects returns objects for making a fake clientset. The pv is
|
||||
|
Loading…
Reference in New Issue
Block a user