Skip to content

Commit 6bdbaa0

Browse files
authored
Merge pull request #517 from xing-yang/volume_health_ga
Promote GetVolume and VolumeCondition to GA
2 parents 910d60f + d9ee9b8 commit 6bdbaa0

File tree

3 files changed

+249
-278
lines changed

3 files changed

+249
-278
lines changed

csi.proto

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ service Controller {
9797
returns (ControllerExpandVolumeResponse) {}
9898

9999
rpc ControllerGetVolume (ControllerGetVolumeRequest)
100-
returns (ControllerGetVolumeResponse) {
101-
option (alpha_method) = true;
102-
}
100+
returns (ControllerGetVolumeResponse) {}
103101
}
104102

105103
service Node {
@@ -884,7 +882,7 @@ message ListVolumesResponse {
884882
// This field is OPTIONAL.
885883
// This field MUST be specified if the
886884
// VOLUME_CONDITION controller capability is supported.
887-
VolumeCondition volume_condition = 2 [(alpha_field) = true];
885+
VolumeCondition volume_condition = 2;
888886
}
889887

890888
message Entry {
@@ -908,16 +906,12 @@ message ListVolumesResponse {
908906
string next_token = 2;
909907
}
910908
message ControllerGetVolumeRequest {
911-
option (alpha_message) = true;
912-
913909
// The ID of the volume to fetch current volume information for.
914910
// This field is REQUIRED.
915911
string volume_id = 1;
916912
}
917913

918914
message ControllerGetVolumeResponse {
919-
option (alpha_message) = true;
920-
921915
message VolumeStatus{
922916
// A list of all the `node_id` of nodes that this volume is
923917
// controller published on.
@@ -1062,14 +1056,12 @@ message ControllerServiceCapability {
10621056
// If for some reason Controller and Node Plugins report
10631057
// misaligned volume conditions, CO SHALL assume the worst case
10641058
// is the truth.
1065-
// Note that, for alpha, `VolumeCondition` is intended be
1066-
// informative for humans only, not for automation.
1067-
VOLUME_CONDITION = 11 [(alpha_enum_value) = true];
1059+
VOLUME_CONDITION = 11;
10681060

10691061
// Indicates the SP supports the ControllerGetVolume RPC.
10701062
// This enables COs to, for example, fetch per volume
10711063
// condition after a volume is provisioned.
1072-
GET_VOLUME = 12 [(alpha_enum_value) = true];
1064+
GET_VOLUME = 12;
10731065

10741066
// Indicates the SP supports the SINGLE_NODE_SINGLE_WRITER and/or
10751067
// SINGLE_NODE_MULTI_WRITER access modes.
@@ -1440,7 +1432,7 @@ message NodeGetVolumeStatsResponse {
14401432
// This field is OPTIONAL.
14411433
// This field MUST be specified if the VOLUME_CONDITION node
14421434
// capability is supported.
1443-
VolumeCondition volume_condition = 2 [(alpha_field) = true];
1435+
VolumeCondition volume_condition = 2;
14441436
}
14451437

14461438
message VolumeUsage {
@@ -1467,8 +1459,6 @@ message VolumeUsage {
14671459

14681460
// VolumeCondition represents the current condition of a volume.
14691461
message VolumeCondition {
1470-
option (alpha_message) = true;
1471-
14721462
// Normal volumes are available for use and operating optimally.
14731463
// An abnormal volume does not meet these criteria.
14741464
// This field is REQUIRED.
@@ -1509,9 +1499,7 @@ message NodeServiceCapability {
15091499
// If for some reason Node and Controller Plugins report
15101500
// misaligned volume conditions, CO SHALL assume the worst case
15111501
// is the truth.
1512-
// Note that, for alpha, `VolumeCondition` is intended to be
1513-
// informative for humans only, not for automation.
1514-
VOLUME_CONDITION = 4 [(alpha_enum_value) = true];
1502+
VOLUME_CONDITION = 4;
15151503

15161504
// Indicates the SP supports the SINGLE_NODE_SINGLE_WRITER and/or
15171505
// SINGLE_NODE_MULTI_WRITER access modes.

0 commit comments

Comments
 (0)