Skip to content

Don't try to chown/chmod on Windows #4838

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

Merged
singholt merged 3 commits into from
Jan 9, 2026
Merged

Don't try to chown/chmod on Windows #4838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
463a7a7
Don't try to chown/chmod on Windows
pendo324 Jan 7, 2026
3775ac6
remove use of runtime platform
pendo324 Jan 8, 2026
d34df8b
fix test
pendo324 Jan 8, 2026
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
19 changes: 2 additions & 17 deletions ecs-agent/daemonimages/csidriver/driver/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,30 +261,15 @@ func (d *nodeService) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol

// Gid is generated based on SourceVolumeHostPath
gid := util.GenerateGIDFromPath(sourceVolumeHostPath)

// Set permissions on the mount point to allow non-root users to access it
if err := setMountPointPermissions(target, gid); err != nil {
if err := setMountPointPermissions(target, gid, volumeID); err != nil {
return nil, status.Errorf(codes.Internal, "Failed to set permissions on mount point %s: %v", target, err)
}
klog.V(4).InfoS("Successfully set permissions on mount point", "target", target, "volumeID", volumeID, "gid", gid)

return &csi.NodeStageVolumeResponse{}, nil
}

// setMountPointPermissions sets the permissions on the mount point to allow non-root users to access it
func setMountPointPermissions(mountPath string, gid int) error {
// Change group ownership to the provided GID
if err := chownFunc(mountPath, -1, gid); err != nil {
return fmt.Errorf("failed to change group ownership of %s to GID %d: %v", mountPath, gid, err)
}

// Set permissions to 0775 with setgid bit
if err := chmodFunc(mountPath, 0775|os.ModeSetgid); err != nil {
return fmt.Errorf("failed to set permissions on %s: %v", mountPath, err)
}

return nil
}

func newNodeService() nodeService {
klog.V(4).InfoS("New node service")
nodeMounter, err := newNodeMounter()
Expand Down
16 changes: 16 additions & 0 deletions ecs-agent/daemonimages/csidriver/driver/node_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,19 @@ func (d *nodeService) getBlockSizeBytes(devicePath string, _ string) (int64, err
}
return gotSizeBytes, nil
}

// setMountPointPermissions sets the permissions on the mount point to allow non-root users to access it
func setMountPointPermissions(mountPath string, gid int, volumeID string) error {
// Change group ownership to the provided GID
if err := chownFunc(mountPath, -1, gid); err != nil {
return fmt.Errorf("failed to change group ownership of %s to GID %d: %v", mountPath, gid, err)
}

// Set permissions to 0775 with setgid bit
if err := chmodFunc(mountPath, 0775|os.ModeSetgid); err != nil {
return fmt.Errorf("failed to set permissions on %s: %v", mountPath, err)
}

klog.V(4).InfoS("Successfully set permissions on mount point", "target", mountPath, "volumeID", volumeID, "gid", gid)
return nil
}
2 changes: 1 addition & 1 deletion ecs-agent/daemonimages/csidriver/driver/node_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ func TestSetMountPointPermissions(t *testing.T) {
}

// Call the function
err := setMountPointPermissions(tc.mountPath, tc.gid)
err := setMountPointPermissions(tc.mountPath, tc.gid, "volumeID")

// Verify results
if tc.expectedError {
Expand Down
7 changes: 7 additions & 0 deletions ecs-agent/daemonimages/csidriver/driver/node_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"strings"

"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/mounter"
"k8s.io/klog/v2"
)

// getBlockSizeBytes gets the size of the disk in bytes
Expand Down Expand Up @@ -75,3 +76,9 @@ func (d *nodeService) findDevicePath(devicePath, volumeID, _ string) (string, er

return foundDiskNumber, nil
}

// setMountPointPermissions is a no-op on Windows because chown/chmod don't work on Windows
func setMountPointPermissions(_ string, _ int, _ string) error {
klog.V(4).InfoS("Skipping setting mount point permissions on Windows")
return nil
}
Loading