Skip to content

Commit 1b83cca

Browse files
committed
Runtime Assisted Mount and Manamgent enhancements
Signed-off-by: Deep Debroy <[email protected]>
1 parent 3b67dfa commit 1b83cca

File tree

2 files changed

+151
-0
lines changed

2 files changed

+151
-0
lines changed

Diff for: csi.proto

+72
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,19 @@ message VolumeCapability {
387387
message MountVolume {
388388
// The filesystem type. This field is OPTIONAL.
389389
// An empty string is equal to an unspecified field value.
390+
// If SP has DEFER_FS_OPS node capability and CO specifies
391+
// fs_defer_ops = true then SP MUST pass this field
392+
// to the container runtime that will mount the file system.
390393
string fs_type = 1;
391394

392395
// The mount options that can be used for the volume. This field is
393396
// OPTIONAL. `mount_flags` MAY contain sensitive information.
394397
// Therefore, the CO and the Plugin MUST NOT leak this information
395398
// to untrusted entities. The total size of this repeated field
396399
// SHALL NOT exceed 4 KiB.
400+
// If SP has DEFER_FS_OPS node capability and CO specifies
401+
// fs_defer_ops = true then SP MUST pass this field
402+
// to the container runtime that will mount the file system.
397403
repeated string mount_flags = 2;
398404

399405
// If SP has VOLUME_MOUNT_GROUP node capability and CO provides
@@ -408,6 +414,27 @@ message VolumeCapability {
408414
// both readable and writable by said mount group identifier.
409415
// This is an OPTIONAL field.
410416
string volume_mount_group = 3;
417+
418+
// If SP has DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP node capability
419+
// and CO provides this field then SP MUST ensure that the
420+
// volume_supplemental_group parameter is passed as a supplemental
421+
// Group ID that owns the file system after it has been mounted by
422+
// the container runtime handler.
423+
// A CO MUST NOT populate this field if defer_fs_ops is empty
424+
// This is an OPTIONAL field.
425+
string volume_supplemental_group = 4 [(alpha_field) = true];
426+
427+
// If SP has DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP_CHANGE_POLICY node
428+
// capability and CO provides this field then SP MUST ensure that
429+
// the volume_supplemental_group_change_policy parameter is passed
430+
// as the policy through which ownership by a supplemental Group ID
431+
// is set after it has been mounted by the container runtime
432+
// handler.
433+
// A CO MUST NOT populate this field if defer_fs_ops or
434+
// volume_supplemental_group is empty
435+
// This is an OPTIONAL field.
436+
string volume_supplemental_group_change_policy = 5
437+
[(alpha_field) = true];
411438
}
412439

413440
// Specify how a volume can be accessed.
@@ -1383,6 +1410,13 @@ message NodePublishVolumeRequest {
13831410
// This field is OPTIONAL and MUST match the volume_context of the
13841411
// volume identified by `volume_id`.
13851412
map<string, string> volume_context = 8;
1413+
1414+
// Indicates SP MUST defer file system mount and any post-mount
1415+
// configuration operations (such as application of file system
1416+
// ownership by a supplemental group, if supported) to
1417+
// a container runtime handler.
1418+
// This field is OPTIONAL.
1419+
bool defer_fs_ops = 9;
13861420
}
13871421

13881422
message NodePublishVolumeResponse {
@@ -1401,6 +1435,11 @@ message NodeUnpublishVolumeRequest {
14011435
// system/filesystem, but, at a minimum, SP MUST accept a max path
14021436
// length of at least 128 bytes.
14031437
string target_path = 2;
1438+
1439+
// Indicates SP MUST defer file system dismount and cleanup
1440+
// to a container runtime handler.
1441+
// This field is OPTIONAL.
1442+
bool defer_fs_ops = 3;
14041443
}
14051444

14061445
message NodeUnpublishVolumeResponse {
@@ -1431,6 +1470,11 @@ message NodeGetVolumeStatsRequest {
14311470
// system/filesystem, but, at a minimum, SP MUST accept a max path
14321471
// length of at least 128 bytes.
14331472
string staging_target_path = 3;
1473+
1474+
// Indicates SP MUST obtain file system stats from a
1475+
// container runtime handler (that has mounted the file system).
1476+
// This field is OPTIONAL.
1477+
bool defer_fs_ops = 4;
14341478
}
14351479

14361480
message NodeGetVolumeStatsResponse {
@@ -1528,6 +1572,22 @@ message NodeServiceCapability {
15281572
// with provided volume group identifier during node stage
15291573
// or node publish RPC calls.
15301574
VOLUME_MOUNT_GROUP = 6;
1575+
1576+
// Indicates that Node service supports deferring file system
1577+
// mount and management operations to a container runtime handler.
1578+
DEFER_FS_OPS = 7 [(alpha_enum_value) = true];
1579+
1580+
// Indicates that Node service supports passing a supplemental
1581+
// Group ID as a post mount configuration when deferring
1582+
// file system mount to a container runtime handler.
1583+
DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP = 8
1584+
[(alpha_enum_value) = true];
1585+
1586+
// Indicates that Node service supports passing a supplemental
1587+
// Group ID change policy as a post mount configuration when
1588+
// deferring file system mount to a container runtime handler.
1589+
DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP_CHANGE_POLICY = 9
1590+
[(alpha_enum_value) = true];
15311591
}
15321592

15331593
Type type = 1;
@@ -1581,6 +1641,13 @@ message NodeGetInfoResponse {
15811641
// Indicates the node exists within the "region" "R1" and the "zone"
15821642
// "Z2".
15831643
Topology accessible_topology = 3;
1644+
1645+
// If SP has DEFER_FS_OPS node capability, a plugin MUST populate
1646+
// this field with the list of file systems that it supports. A CO
1647+
// SHOULD use this to match the deferral capabilities of a plugin
1648+
// with a container runtime handler for a workload.
1649+
// This field is OPTIONAL.
1650+
repeated string supported_file_systems = 4;
15841651
}
15851652
message NodeExpandVolumeRequest {
15861653
// The ID of the volume. This field is REQUIRED.
@@ -1628,6 +1695,11 @@ message NodeExpandVolumeRequest {
16281695
// section on how to use this field.
16291696
map<string, string> secrets = 6
16301697
[(csi_secret) = true, (alpha_field) = true];
1698+
1699+
// Indicates SP MUST defer file system expansion to a
1700+
// container runtime handler (that has mounted the file system).
1701+
// This field is OPTIONAL.
1702+
bool defer_fs_ops = 7 [(alpha_enum_value) = true];
16311703
}
16321704

16331705
message NodeExpandVolumeResponse {

Diff for: spec.md

+79
Original file line numberDiff line numberDiff line change
@@ -854,13 +854,19 @@ message VolumeCapability {
854854
message MountVolume {
855855
// The filesystem type. This field is OPTIONAL.
856856
// An empty string is equal to an unspecified field value.
857+
// If SP has DEFER_FS_OPS node capability and CO specifies
858+
// fs_defer_ops = true then SP MUST pass this field
859+
// to the container runtime that will mount the file system.
857860
string fs_type = 1;
858861
859862
// The mount options that can be used for the volume. This field is
860863
// OPTIONAL. `mount_flags` MAY contain sensitive information.
861864
// Therefore, the CO and the Plugin MUST NOT leak this information
862865
// to untrusted entities. The total size of this repeated field
863866
// SHALL NOT exceed 4 KiB.
867+
// If SP has DEFER_FS_OPS node capability and CO specifies
868+
// fs_defer_ops = true then SP MUST pass this field
869+
// to the container runtime that will mount the file system.
864870
repeated string mount_flags = 2;
865871
866872
// If SP has VOLUME_MOUNT_GROUP node capability and CO provides
@@ -875,6 +881,27 @@ message VolumeCapability {
875881
// both readable and writable by said mount group identifier.
876882
// This is an OPTIONAL field.
877883
string volume_mount_group = 3;
884+
885+
// If SP has DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP node capability
886+
// and CO provides this field then SP MUST ensure that the
887+
// volume_supplemental_group parameter is passed as a supplemental
888+
// Group ID that owns the file system after it has been mounted by
889+
// the container runtime handler.
890+
// A CO MUST NOT populate this field if defer_fs_ops is empty
891+
// This is an OPTIONAL field.
892+
string volume_supplemental_group = 4 [(alpha_field) = true];
893+
894+
// If SP has DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP_CHANGE_POLICY node
895+
// capability and CO provides this field then SP MUST ensure that
896+
// the volume_supplemental_group_change_policy parameter is passed
897+
// as the policy through which ownership by a supplemental Group ID
898+
// is set after it has been mounted by the container runtime
899+
// handler.
900+
// A CO MUST NOT populate this field if defer_fs_ops or
901+
// volume_supplemental_group is empty
902+
// This is an OPTIONAL field.
903+
string volume_supplemental_group_change_policy = 5
904+
[(alpha_field) = true];
878905
}
879906
880907
// Specify how a volume can be accessed.
@@ -2349,6 +2376,13 @@ message NodePublishVolumeRequest {
23492376
// This field is OPTIONAL and MUST match the volume_context of the
23502377
// volume identified by `volume_id`.
23512378
map<string, string> volume_context = 8;
2379+
2380+
// Indicates SP MUST defer file system mount and any post-mount
2381+
// configuration operations (such as application of file system
2382+
// ownership by a supplemental group, if supported) to
2383+
// a container runtime handler.
2384+
// This field is OPTIONAL.
2385+
bool defer_fs_ops = 9;
23522386
}
23532387
23542388
message NodePublishVolumeResponse {
@@ -2399,6 +2433,11 @@ message NodeUnpublishVolumeRequest {
23992433
// system/filesystem, but, at a minimum, SP MUST accept a max path
24002434
// length of at least 128 bytes.
24012435
string target_path = 2;
2436+
2437+
// Indicates SP MUST defer file system dismount and cleanup
2438+
// to a container runtime handler.
2439+
// This field is OPTIONAL.
2440+
bool defer_fs_ops = 3;
24022441
}
24032442
24042443
message NodeUnpublishVolumeResponse {
@@ -2455,6 +2494,11 @@ message NodeGetVolumeStatsRequest {
24552494
// system/filesystem, but, at a minimum, SP MUST accept a max path
24562495
// length of at least 128 bytes.
24572496
string staging_target_path = 3;
2497+
2498+
// Indicates SP MUST obtain file system stats from a
2499+
// container runtime handler (that has mounted the file system).
2500+
// This field is OPTIONAL.
2501+
bool defer_fs_ops = 4;
24582502
}
24592503
24602504
message NodeGetVolumeStatsResponse {
@@ -2571,6 +2615,22 @@ message NodeServiceCapability {
25712615
// with provided volume group identifier during node stage
25722616
// or node publish RPC calls.
25732617
VOLUME_MOUNT_GROUP = 6;
2618+
2619+
// Indicates that Node service supports deferring file system
2620+
// mount and management operations to a container runtime handler.
2621+
DEFER_FS_OPS = 7 [(alpha_enum_value) = true];
2622+
2623+
// Indicates that Node service supports passing a supplemental
2624+
// Group ID as a post mount configuration when deferring
2625+
// file system mount to a container runtime handler.
2626+
DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP = 8
2627+
[(alpha_enum_value) = true];
2628+
2629+
// Indicates that Node service supports passing a supplemental
2630+
// Group ID change policy as a post mount configuration when
2631+
// deferring file system mount to a container runtime handler.
2632+
DEFER_FS_OPS_WITH_SUPPLEMENTAL_GROUP_CHANGE_POLICY = 9
2633+
[(alpha_enum_value) = true];
25742634
}
25752635
25762636
Type type = 1;
@@ -2640,6 +2700,13 @@ message NodeGetInfoResponse {
26402700
// Indicates the node exists within the "region" "R1" and the "zone"
26412701
// "Z2".
26422702
Topology accessible_topology = 3;
2703+
2704+
// If SP has DEFER_FS_OPS node capability, a plugin MUST populate
2705+
// this field with the list of file systems that it supports. A CO
2706+
// SHOULD use this to match the deferral capabilities of a plugin
2707+
// with a container runtime handler for a workload.
2708+
// This field is OPTIONAL.
2709+
repeated string supported_file_systems = 4;
26432710
}
26442711
```
26452712

@@ -2717,6 +2784,11 @@ message NodeExpandVolumeRequest {
27172784
// section on how to use this field.
27182785
map<string, string> secrets = 6
27192786
[(csi_secret) = true, (alpha_field) = true];
2787+
2788+
// Indicates SP MUST defer file system expansion to a
2789+
// container runtime handler (that has mounted the file system).
2790+
// This field is OPTIONAL.
2791+
bool defer_fs_ops = 7 [(alpha_enum_value) = true];
27202792
}
27212793
27222794
message NodeExpandVolumeResponse {
@@ -2785,6 +2857,13 @@ message NodeExpandVolumeResponse {
27852857
* Plugins SHALL NOT create additional files or directories adjacent to the UNIX socket specified by `CSI_ENDPOINT`; violations of this requirement constitute "abuse".
27862858
* The Plugin Supervisor is the ultimate authority of the directory in which the UNIX socket endpoint is created and MAY enforce policies to prevent and/or mitigate abuse of the directory by Plugins.
27872859

2860+
#### Deferring Filesystem Mount and Management to a Container Runtime Handler
2861+
A Plugin may have the capability to defer file system mount and management operations to a container runtime handler.
2862+
The CO SHOULD populate `defer_fs_ops` as `True` in CSI Node APIs when the following conditions are fulfilled:
2863+
- The container runtime handler (associated with a workload) supports deferral of file system mount and management operations from a CSI plugin.
2864+
- The CSI plugin is able to support deferral of file system mount and management operations to a container runtime handler.
2865+
- Both container runtime handler and CSI plugin is compatible around support for mounting specific file systems and applying post-mount configuration based on the workload spec (e.g. supplemental group ownership)
2866+
27882867
### Supervised Lifecycle Management
27892868

27902869
* For Plugins packaged in software form:

0 commit comments

Comments
 (0)