e2e: add podsecuritycontext fsgroup for normal user validation

considering the pod has run as normal user, the fsgroup has also set to the same. Signed-off-by: Humble Chirammal <[email protected]>
ceph · Jan 25, 2022 · 7c044c6 · 7c044c6
1 parent 5c05b90
commit 7c044c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/e2e/utils.go b/e2e/utils.go
@@ -333,6 +333,7 @@ func validateNormalUserPVCAccess(pvcPath string, f *framework.Framework) error {
 			},
 		},
 		Spec: v1.PodSpec{
+			SecurityContext: &v1.PodSecurityContext{FSGroup: &user},
 			Containers: []v1.Container{
 				{
 					Name:    "write-pod",

diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go
@@ -420,7 +420,7 @@ func (ns *NodeServer) stageTransaction(
 	transaction.isStagePathCreated = true
 
 	// nodeStage Path
-	_, err = ns.mountVolumeToStagePath(ctx, req, staticVol, stagingTargetPath, devicePath)
+	err = ns.mountVolumeToStagePath(ctx, req, staticVol, stagingTargetPath, devicePath)
 	if err != nil {
 		return transaction, err
 	}
@@ -678,7 +678,7 @@ func (ns *NodeServer) mountVolumeToStagePath(
 	ctx context.Context,
 	req *csi.NodeStageVolumeRequest,
 	staticVol bool,
-	stagingPath, devicePath string) (bool, error) {
+	stagingPath, devicePath string) error {
 	readOnly := false
 	fsType := req.GetVolumeCapability().GetMount().GetFsType()
 	diskMounter := &mount.SafeFormatAndMount{Interface: ns.Mounter, Exec: utilexec.New()}
@@ -696,7 +696,7 @@ func (ns *NodeServer) mountVolumeToStagePath(
 	if err != nil {
 		log.ErrorLog(ctx, "failed to get disk format for path %s, error: %v", devicePath, err)
 
-		return readOnly, err
+		return err
 	}
 
 	opt := []string{"_netdev"}
@@ -736,7 +736,7 @@ func (ns *NodeServer) mountVolumeToStagePath(
 			if cmdErr != nil {
 				log.ErrorLog(ctx, "failed to run mkfs error: %v, output: %v", cmdErr, string(cmdOut))
 
-				return readOnly, cmdErr
+				return cmdErr
 			}
 		}
 	}
@@ -757,7 +757,7 @@ func (ns *NodeServer) mountVolumeToStagePath(
 			err)
 	}
 
-	return readOnly, err
+	return err
 }
 
 func (ns *NodeServer) mountVolume(ctx context.Context, stagingPath string, req *csi.NodePublishVolumeRequest) error {