Skip to content

[experiment] implement VMG capability - DO NOT MERGE #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[experiment] implement VMG capability - DO NOT MERGE #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a22721
implement VMG capability
astef Feb 18, 2025
2b69ed4
remove setgid
astef Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions images/csi-nfs/patches/0004-volume-mount-group-experiment.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
diff --git a/pkg/nfs/nfs.go b/pkg/nfs/nfs.go
index e91093d..4114aba 100644
--- a/pkg/nfs/nfs.go
+++ b/pkg/nfs/nfs.go
@@ -106,6 +106,7 @@ func NewDriver(options *DriverOptions) *Driver {
csi.NodeServiceCapability_RPC_GET_VOLUME_STATS,
csi.NodeServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER,
csi.NodeServiceCapability_RPC_UNKNOWN,
+ csi.NodeServiceCapability_RPC_VOLUME_MOUNT_GROUP,
})
n.volumeLocks = NewVolumeLocks()

diff --git a/pkg/nfs/nodeserver.go b/pkg/nfs/nodeserver.go
index 76e0d67..6135899 100644
--- a/pkg/nfs/nodeserver.go
+++ b/pkg/nfs/nodeserver.go
@@ -19,6 +19,7 @@ package nfs
import (
"fmt"
"os"
+ "os/user"
"strconv"
"strings"
"time"
@@ -141,6 +142,9 @@ func (ns *NodeServer) NodePublishVolume(_ context.Context, req *csi.NodePublishV
return nil, status.Error(codes.Internal, err.Error())
}

+ // TODO
+ mountPermissions = mountPermissions &^ uint64(os.ModeSetgid)
+
if mountPermissions > 0 {
if err := chmodIfPermissionMismatch(targetPath, os.FileMode(mountPermissions)); err != nil {
return nil, status.Error(codes.Internal, err.Error())
@@ -148,6 +152,20 @@ func (ns *NodeServer) NodePublishVolume(_ context.Context, req *csi.NodePublishV
} else {
klog.V(2).Infof("skip chmod on targetPath(%s) since mountPermissions is set as 0", targetPath)
}
+
+ // TODO
+ grp, err := user.LookupGroup(volCap.GetMount().VolumeMountGroup)
+ if err != nil {
+ return nil, status.Error(codes.Internal, err.Error())
+ }
+ gid, err := strconv.Atoi(grp.Gid)
+ if err != nil {
+ return nil, status.Error(codes.Internal, err.Error())
+ }
+ if err := os.Chown(targetPath, -1, gid); err != nil {
+ return nil, status.Error(codes.Internal, err.Error())
+ }
+
klog.V(2).Infof("volume(%s) mount %s on %s succeeded", volumeID, source, targetPath)
return &csi.NodePublishVolumeResponse{}, nil
}
Loading