Skip to content

Commit

Permalink
Merge pull request #517 from xing-yang/volume_health_ga
Browse files Browse the repository at this point in the history
Promote GetVolume and VolumeCondition to GA
  • Loading branch information
saad-ali authored Oct 20, 2022
2 parents 910d60f + d9ee9b8 commit 6bdbaa0
Show file tree
Hide file tree
Showing 3 changed files with 249 additions and 278 deletions.
24 changes: 6 additions & 18 deletions csi.proto
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ service Controller {
returns (ControllerExpandVolumeResponse) {}

rpc ControllerGetVolume (ControllerGetVolumeRequest)
returns (ControllerGetVolumeResponse) {
option (alpha_method) = true;
}
returns (ControllerGetVolumeResponse) {}
}

service Node {
Expand Down Expand Up @@ -884,7 +882,7 @@ message ListVolumesResponse {
// This field is OPTIONAL.
// This field MUST be specified if the
// VOLUME_CONDITION controller capability is supported.
VolumeCondition volume_condition = 2 [(alpha_field) = true];
VolumeCondition volume_condition = 2;
}

message Entry {
Expand All @@ -908,16 +906,12 @@ message ListVolumesResponse {
string next_token = 2;
}
message ControllerGetVolumeRequest {
option (alpha_message) = true;

// The ID of the volume to fetch current volume information for.
// This field is REQUIRED.
string volume_id = 1;
}

message ControllerGetVolumeResponse {
option (alpha_message) = true;

message VolumeStatus{
// A list of all the `node_id` of nodes that this volume is
// controller published on.
Expand Down Expand Up @@ -1062,14 +1056,12 @@ message ControllerServiceCapability {
// If for some reason Controller and Node Plugins report
// misaligned volume conditions, CO SHALL assume the worst case
// is the truth.
// Note that, for alpha, `VolumeCondition` is intended be
// informative for humans only, not for automation.
VOLUME_CONDITION = 11 [(alpha_enum_value) = true];
VOLUME_CONDITION = 11;

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

// Indicates the SP supports the SINGLE_NODE_SINGLE_WRITER and/or
// SINGLE_NODE_MULTI_WRITER access modes.
Expand Down Expand Up @@ -1440,7 +1432,7 @@ message NodeGetVolumeStatsResponse {
// This field is OPTIONAL.
// This field MUST be specified if the VOLUME_CONDITION node
// capability is supported.
VolumeCondition volume_condition = 2 [(alpha_field) = true];
VolumeCondition volume_condition = 2;
}

message VolumeUsage {
Expand All @@ -1467,8 +1459,6 @@ message VolumeUsage {

// VolumeCondition represents the current condition of a volume.
message VolumeCondition {
option (alpha_message) = true;

// Normal volumes are available for use and operating optimally.
// An abnormal volume does not meet these criteria.
// This field is REQUIRED.
Expand Down Expand Up @@ -1509,9 +1499,7 @@ message NodeServiceCapability {
// If for some reason Node and Controller Plugins report
// misaligned volume conditions, CO SHALL assume the worst case
// is the truth.
// Note that, for alpha, `VolumeCondition` is intended to be
// informative for humans only, not for automation.
VOLUME_CONDITION = 4 [(alpha_enum_value) = true];
VOLUME_CONDITION = 4;

// Indicates the SP supports the SINGLE_NODE_SINGLE_WRITER and/or
// SINGLE_NODE_MULTI_WRITER access modes.
Expand Down
Loading

0 comments on commit 6bdbaa0

Please sign in to comment.