Merge pull request #527 from container-storage-interface/master

Cherry pick latest PRs for 1.7

csi.proto

@@ -97,9 +97,7 @@ service Controller {
     returns (ControllerExpandVolumeResponse) {}
 
   rpc ControllerGetVolume (ControllerGetVolumeRequest)
-    returns (ControllerGetVolumeResponse) {
-        option (alpha_method) = true;
-    }
+    returns (ControllerGetVolumeResponse) {}
 }
 
 service Node {
@@ -407,7 +405,7 @@ message VolumeCapability {
     // manner, unless otherwise modified by a workload, that they are
     // both readable and writable by said mount group identifier.
     // This is an OPTIONAL field.
-    string volume_mount_group = 3 [(alpha_field) = true];
+    string volume_mount_group = 3;
   }
 
   // Specify how a volume can be accessed.
@@ -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 {
@@ -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.
@@ -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.
@@ -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 {
@@ -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.
@@ -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.
@@ -1527,7 +1515,7 @@ message NodeServiceCapability {
       // Indicates that Node service supports mounting volumes
       // with provided volume group identifier during node stage
       // or node publish RPC calls.
-      VOLUME_MOUNT_GROUP = 6 [(alpha_enum_value) = true];
+      VOLUME_MOUNT_GROUP = 6;
     }
 
     Type type = 1;