Unverified Commit 8440a509 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #55796 from humblec/construct

Automatic merge from submit-queue (batch tested with PRs 55938, 56055, 53385, 55796, 55922). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Avoid wrong filling of glusterfs Volume Spec at ConstructVolumeSpec() Issue#https://github.com/kubernetes/kubernetes/issues/37625, https://github.com/kubernetes/kubernetes/issues/49108Signed-off-by: 's avatarHumble Chirammal <hchiramm@redhat.com>
parents 1d7f7eaf 13a86d81
...@@ -197,16 +197,11 @@ func (plugin *glusterfsPlugin) newUnmounterInternal(volName string, podUID types ...@@ -197,16 +197,11 @@ func (plugin *glusterfsPlugin) newUnmounterInternal(volName string, podUID types
} }
func (plugin *glusterfsPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) { func (plugin *glusterfsPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) {
glusterfsVolume := &v1.Volume{
Name: volumeName, // To reconstrcut volume spec we need endpoint where fetching endpoint from mount
VolumeSource: v1.VolumeSource{ // string looks to be impossible, so returning error.
Glusterfs: &v1.GlusterfsVolumeSource{
EndpointsName: volumeName, return nil, fmt.Errorf("impossible to reconstruct glusterfs volume spec from volume mountpath")
Path: volumeName,
},
},
}
return volume.NewSpecFromVolume(glusterfsVolume), nil
} }
// Glusterfs volumes represent a bare host file or directory mount of an Glusterfs export. // Glusterfs volumes represent a bare host file or directory mount of an Glusterfs export.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment