Glusterfs: Return spec.pv.spec.glusterfs.readonly

Before it only checked spec.ReadOnly, but now it checks spec.pv.spec.glusterfs.readonly flag. This patch also correct a bug in old code where it returned mounter true even when pv is false. This is a follow up PR based on comment# kubernetes#60195 (comment) Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
humblec · Nov 9, 2018 · d0fdf9d · d0fdf9d
1 parent 8825843
commit d0fdf9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go
@@ -461,7 +461,7 @@ func getVolumeInfo(spec *volume.Spec) (string, bool, error) {
 
 	} else if spec.PersistentVolume != nil &&
 		spec.PersistentVolume.Spec.Glusterfs != nil {
-		return spec.PersistentVolume.Spec.Glusterfs.Path, spec.ReadOnly, nil
+		return spec.PersistentVolume.Spec.Glusterfs.Path, spec.PersistentVolume.Spec.Glusterfs.ReadOnly, nil
 	}
 	return "", false, fmt.Errorf("Spec does not reference a Glusterfs volume type")
 }

diff --git a/pkg/volume/glusterfs/glusterfs_test.go b/pkg/volume/glusterfs/glusterfs_test.go
@@ -160,7 +160,7 @@ func TestPluginPersistentVolume(t *testing.T) {
 		},
 		Spec: v1.PersistentVolumeSpec{
 			PersistentVolumeSource: v1.PersistentVolumeSource{
-				Glusterfs: &v1.GlusterfsPersistentVolumeSource{EndpointsName: "ep", Path: "vol", ReadOnly: false},
+				Glusterfs: &v1.GlusterfsPersistentVolumeSource{EndpointsName: "ep", Path: "vol", ReadOnly: true},
 			},
 		},
 	}
@@ -181,7 +181,7 @@ func TestPersistentClaimReadOnlyFlag(t *testing.T) {
 		},
 		Spec: v1.PersistentVolumeSpec{
 			PersistentVolumeSource: v1.PersistentVolumeSource{
-				Glusterfs: &v1.GlusterfsPersistentVolumeSource{EndpointsName: "ep", Path: "vol", ReadOnly: false},
+				Glusterfs: &v1.GlusterfsPersistentVolumeSource{EndpointsName: "ep", Path: "vol", ReadOnly: true},
 			},
 			ClaimRef: &v1.ObjectReference{
 				Name: "claimA",