From 77011fbc61cb858683ad2984fa8c2f4368619ef1 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Tue, 15 Mar 2022 16:34:28 +0530 Subject: [PATCH] cephfs: remove kubernetes csi prefixed parameters remove kubernetes csi prefixed parameters from the volumeContext as we dont want to store it in the PV VolumeAttributes. Signed-off-by: Madhu Rajanna --- internal/cephfs/controllerserver.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go index 5aa94c551..8ed06d5fe 100644 --- a/internal/cephfs/controllerserver.go +++ b/internal/cephfs/controllerserver.go @@ -27,6 +27,7 @@ import ( fsutil "github.com/ceph/ceph-csi/internal/cephfs/util" csicommon "github.com/ceph/ceph-csi/internal/csi-common" "github.com/ceph/ceph-csi/internal/util" + "github.com/ceph/ceph-csi/internal/util/k8s" "github.com/ceph/ceph-csi/internal/util/log" "github.com/container-storage-interface/spec/lib/go/csi" @@ -267,7 +268,8 @@ func (cs *ControllerServer) CreateVolume( } } - volumeContext := req.GetParameters() + // remove kubernetes csi prefixed parameters. + volumeContext := k8s.RemoveCSIPrefixedParameters(req.GetParameters()) volumeContext["subvolumeName"] = vID.FsSubvolName volumeContext["subvolumePath"] = volOptions.RootPath volume := &csi.Volume{ @@ -340,7 +342,8 @@ func (cs *ControllerServer) CreateVolume( log.DebugLog(ctx, "cephfs: successfully created backing volume named %s for request name %s", vID.FsSubvolName, requestName) - volumeContext := req.GetParameters() + // remove kubernetes csi prefixed parameters. + volumeContext := k8s.RemoveCSIPrefixedParameters(req.GetParameters()) volumeContext["subvolumeName"] = vID.FsSubvolName volumeContext["subvolumePath"] = volOptions.RootPath volume := &csi.Volume{