mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
Merge pull request #124069 from carlory/clean-100000
fix ProbeControllerVolumePlugins func
This commit is contained in:
commit
fc6c7d743d
@ -32,7 +32,6 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/volume/flexvolume"
|
"k8s.io/kubernetes/pkg/volume/flexvolume"
|
||||||
"k8s.io/kubernetes/pkg/volume/hostpath"
|
"k8s.io/kubernetes/pkg/volume/hostpath"
|
||||||
"k8s.io/kubernetes/pkg/volume/iscsi"
|
"k8s.io/kubernetes/pkg/volume/iscsi"
|
||||||
"k8s.io/kubernetes/pkg/volume/local"
|
|
||||||
"k8s.io/kubernetes/pkg/volume/nfs"
|
"k8s.io/kubernetes/pkg/volume/nfs"
|
||||||
volumeutil "k8s.io/kubernetes/pkg/volume/util"
|
volumeutil "k8s.io/kubernetes/pkg/volume/util"
|
||||||
|
|
||||||
@ -121,9 +120,6 @@ func ProbeControllerVolumePlugins(logger klog.Logger, config persistentvolumecon
|
|||||||
return allPlugins, err
|
return allPlugins, err
|
||||||
}
|
}
|
||||||
|
|
||||||
allPlugins = append(allPlugins, local.ProbeVolumePlugins()...)
|
|
||||||
allPlugins = append(allPlugins, csi.ProbeVolumePlugins()...)
|
|
||||||
|
|
||||||
return allPlugins, nil
|
return allPlugins, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user