Merge pull request #70860 from humblec/getVolumeName

GlusterFS: Move GetVolumeName() to unimplemented func.
This commit is contained in:
k8s-ci-robot 2018-11-29 07:36:28 -08:00 committed by GitHub
commit d80614d4a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -106,30 +106,7 @@ func (plugin *glusterfsPlugin) GetPluginName() string {
} }
func (plugin *glusterfsPlugin) GetVolumeName(spec *volume.Spec) (string, error) { func (plugin *glusterfsPlugin) GetVolumeName(spec *volume.Spec) (string, error) {
var endpointName string return "", fmt.Errorf("GetVolumeName() is unimplemented for GlusterFS")
var endpointsNsPtr *string
volPath, _, err := getVolumeInfo(spec)
if err != nil {
return "", err
}
if spec.Volume != nil && spec.Volume.Glusterfs != nil {
endpointName = spec.Volume.Glusterfs.EndpointsName
} else if spec.PersistentVolume != nil &&
spec.PersistentVolume.Spec.Glusterfs != nil {
endpointName = spec.PersistentVolume.Spec.Glusterfs.EndpointsName
endpointsNsPtr = spec.PersistentVolume.Spec.Glusterfs.EndpointsNamespace
if endpointsNsPtr != nil && *endpointsNsPtr != "" {
return fmt.Sprintf("%v:%v:%v", endpointName, *endpointsNsPtr, volPath), nil
}
return "", fmt.Errorf("invalid endpointsnamespace in provided glusterfs PV spec")
} else {
return "", fmt.Errorf("unable to fetch required parameters from provided glusterfs spec")
}
return fmt.Sprintf("%v:%v", endpointName, volPath), nil
} }
func (plugin *glusterfsPlugin) CanSupport(spec *volume.Spec) bool { func (plugin *glusterfsPlugin) CanSupport(spec *volume.Spec) bool {