Skip to content

Add unixGroupID annotation to set UNIX group ownership on ONTAP NAS volumes #1190

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

Open
Sunnatillo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add unixGroupID annotation to set UNIX group ownership on ONTAP NAS volumes #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions frontend/csi/controller_helpers/kubernetes/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ const (
AnnTieringPolicy = prefix + "/tieringPolicy"
AnnTieringMinimumCoolingDays = prefix + "/tieringMinimumCoolingDays"

// AnnUnixGroupID sets the UNIX group ownership (GID) of an ONTAP NAS volume at provisioning time.
AnnUnixGroupID = prefix + "/unixGroupID"

// Pod remediation policy annotation and values
AnnPodRemediationPolicyAnnotation = prefix + "/podRemediationPolicy"
PodRemediationPolicyDelete = "delete"
Expand Down
1 change: 1 addition & 0 deletions frontend/csi/controller_helpers/kubernetes/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,7 @@ func getVolumeConfig(
UnixPermissions: getAnnotation(annotations, AnnUnixPermissions),
StorageClass: storageClass.Name,
BlockSize: getAnnotation(annotations, AnnBlockSize),
UnixGroupID: getAnnotation(annotations, AnnUnixGroupID),
FileSystem: getAnnotation(annotations, AnnFileSystem),
LUKSEncryption: luksEncryption,
SplitOnClone: getAnnotation(annotations, AnnSplitOnClone),
Expand Down
32 changes: 16 additions & 16 deletions mocks/mock_storage_drivers/mock_ontap/mock_ontap_rest_interface.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions mocks/mock_storage_drivers/mock_ontap/mock_ontap_zapi_interface.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions storage/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type VolumeConfig struct {
UnixPermissions string `json:"unixPermissions,omitempty"`
StorageClass string `json:"storageClass,omitempty"`
AccessMode config.AccessMode `json:"accessMode,omitempty"`
UnixGroupID string `json:"unixGroupID,omitempty"`
VolumeMode config.VolumeMode `json:"volumeMode,omitempty"`
AccessInfo models.VolumeAccessInfo `json:"accessInformation"`
// MoveInfo is the operational status of an ongoing volume
Expand Down
28 changes: 24 additions & 4 deletions storage_drivers/ontap/api/abstraction_rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,14 @@ func (d OntapAPIREST) VolumeCreate(ctx context.Context, volume Volume) (string,
aggregateName = volume.Aggregates[0]
}

gid, err := parseUnixGroupID(volume.UnixGroupID)
if err != nil {
return "", err
}

volumeUUID, creationErr := d.api.VolumeCreate(ctx, volume.Name, aggregateName, volume.Size, volume.SpaceReserve,
volume.SnapshotPolicy, volume.UnixPermissions, volume.ExportPolicy, volume.SecurityStyle,
volume.TieringPolicy, volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve, volume.DPVolume)
volume.TieringPolicy, volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve, volume.DPVolume, gid)
if creationErr != nil {
return "", fmt.Errorf("error creating volume: %v", creationErr)
}
Expand All @@ -216,9 +221,14 @@ func (d OntapAPIREST) VolumeCreateBalanced(ctx context.Context, volume Volume) (
return "", errors.UnsupportedError("ONTAP version does not support balanced placement")
}

gid, err := parseUnixGroupID(volume.UnixGroupID)
if err != nil {
return "", err
}

volumeUUID, creationErr := d.api.VolumeCreateBalanced(ctx, volume.Name, volume.Size, volume.SpaceReserve,
volume.SnapshotPolicy, volume.UnixPermissions, volume.ExportPolicy, volume.SecurityStyle,
volume.TieringPolicy, volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve, volume.DPVolume)
volume.TieringPolicy, volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve, volume.DPVolume, gid)
if creationErr != nil {
return "", fmt.Errorf("error creating volume: %v", creationErr)
}
Expand Down Expand Up @@ -733,9 +743,14 @@ func (d OntapAPIREST) FlexgroupCreate(ctx context.Context, volume Volume) error
return fmt.Errorf("%v is an invalid volume size: %v", volume.Size, err)
}

gid, err := parseUnixGroupID(volume.UnixGroupID)
if err != nil {
return err
}

creationErr := d.api.FlexGroupCreate(ctx, volume.Name, volumeSize, volume.Aggregates, volume.SpaceReserve,
volume.SnapshotPolicy, volume.UnixPermissions, volume.ExportPolicy, volume.SecurityStyle, volume.TieringPolicy,
volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve)
volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve, gid)
if creationErr != nil {
return fmt.Errorf("error creating volume: %v", creationErr)
}
Expand Down Expand Up @@ -764,9 +779,14 @@ func (d OntapAPIREST) FlexgroupCreateBalanced(ctx context.Context, volume Volume
return fmt.Errorf("%v is an invalid volume size: %v", volume.Size, err)
}

gid, err := parseUnixGroupID(volume.UnixGroupID)
if err != nil {
return err
}

creationErr := d.api.FlexGroupCreateBalanced(ctx, volume.Name, volumeSize, volume.SpaceReserve,
volume.SnapshotPolicy, volume.UnixPermissions, volume.ExportPolicy, volume.SecurityStyle, volume.TieringPolicy,
volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve)
volume.Comment, volume.Qos, volume.Encrypt, volume.SnapshotReserve, gid)
if creationErr != nil {
return fmt.Errorf("error creating volume: %v", creationErr)
}
Expand Down
Loading