From 42ed7d85ee183249c5e6d2fedc482c988651f75d Mon Sep 17 00:00:00 2001 From: Pawan Date: Wed, 27 May 2020 14:08:36 +0530 Subject: [PATCH] fix(readonly): honouring readonly flag. Readonly flag does not come as mount option, it has separate field to mention readonly flag. ZFS-LocalPV driver should check that field and add "ro" as mountoption. Signed-off-by: Pawan --- pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go | 4 ---- pkg/driver/agent.go | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go b/pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go index 7962a10..43660d7 100644 --- a/pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go +++ b/pkg/apis/openebs.io/zfs/v1alpha1/zfsvolume.go @@ -57,10 +57,6 @@ type MountInfo struct { // on that node MountPath string `json:"mountPath"` - // ReadOnly specifies if the volume needs - // to be mounted in ReadOnly mode - ReadOnly bool `json:"readOnly"` - // MountOptions specifies the options with // which mount needs to be attempted MountOptions []string `json:"mountOptions"` diff --git a/pkg/driver/agent.go b/pkg/driver/agent.go index d5e9850..61da965 100644 --- a/pkg/driver/agent.go +++ b/pkg/driver/agent.go @@ -76,9 +76,12 @@ func GetVolAndMountInfo( mountinfo.FSType = req.GetVolumeCapability().GetMount().GetFsType() mountinfo.MountPath = req.GetTargetPath() - mountinfo.ReadOnly = req.GetReadonly() mountinfo.MountOptions = append(mountinfo.MountOptions, req.GetVolumeCapability().GetMount().GetMountFlags()...) + if req.GetReadonly() { + mountinfo.MountOptions = append(mountinfo.MountOptions, "ro") + } + getOptions := metav1.GetOptions{} vol, err := volbuilder.NewKubeclient(). WithNamespace(zfs.OpenEBSNamespace).