feat: 集群管理添加两个接口

bcs-services/bcs-cluster-manager/api/clustermanager/clustermanager.proto

@@ -261,6 +261,17 @@ service ClusterManager {
     };
   }
 
+  rpc AddClusterCidr(AddClusterCidrReq) returns (AddClusterCidrResp) {
+    option (google.api.http) = {
+      post : "/clustermanager/v1/clusters/{clusterID}/cidrs"
+      body : "*"
+    };
+    option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = {
+      description : "给集群增加ClusterCIDR"
+      summary : "给集群增加ClusterCIDR"
+    };
+  }
+
   rpc SwitchClusterUnderlayNetwork(SwitchClusterUnderlayNetworkReq) returns (SwitchClusterUnderlayNetworkResp) {
     option (google.api.http) = {
       post : "/clustermanager/v1/clusters/{clusterID}/networks/underlay"
@@ -950,6 +961,16 @@ service ClusterManager {
       summary : "查询Task列表"
     };
   }
+  rpc ListTaskV2(ListTaskV2Request) returns (ListTaskV2Response) {
+    option (google.api.http) = {
+      get : "/clustermanager/v2/task"
+    };
+    option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = {
+      description : "根据查询条件过滤Task列表，如果某项条件值为空，则忽略此"
+                    "条件。如果所有条件都为空，则默认查询所有集群"
+      summary : "查询Task列表"
+    };
+  }
 
   //* ClusterAutoScalingOption information management *
   rpc CreateAutoScalingOption(CreateAutoScalingOptionRequest) returns (CreateAutoScalingOptionResponse) {
@@ -1238,6 +1259,15 @@ service ClusterManager {
       summary : "获取云所属地域vpc列表"
     };
   }
+  rpc ListRecommendCloudVpcCidr(ListRecommendCloudVpcCidrRequest) returns (ListRecommendCloudVpcCidrResponse) {
+    option (google.api.http) = {
+      get : "/clustermanager/v1/clouds/{cloudID}/vpcs/recommendcidr"
+    };
+    option (grpc.gateway.protoc_gen_swagger.options.openapiv2_operation) = {
+      description : "根据掩码获取云所属地域vpc推荐cidr"
+      summary : "根据掩码获取云所属地域vpc推荐cidr"
+    };
+  }
   rpc CheckCidrConflictFromVpc(CheckCidrConflictFromVpcRequest) returns (CheckCidrConflictFromVpcResponse) {
     option (google.api.http) = {
       get : "/clustermanager/v1/clouds/{cloudID}/vpcs/{vpcId}/cidrconflict"
@@ -5639,6 +5669,56 @@ message AddSubnetToClusterResp {
   }];
 }
 
+message AddClusterCidrReq {
+  option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
+    json_schema : {
+      title : "AddSubnetToClusterReq"
+      description : "集群添加cidr网段请求"
+      required : [ "clusterID", "cidrs" ]
+    }
+  };
+
+  string clusterID = 1 [
+    (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+      title : "clusterID",
+      description : "集群ID"
+    },
+    (validate.rules).string = {min_len : 1, max_len : 100, pattern : "^[0-9a-zA-Z-]+$", prefix: "BCS-"}];
+  repeated string cidrs = 2 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "cidrs",
+    description : "添加cidr网段的资源"
+  }];
+  string operator = 3[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "operator",
+    description : "操作人"
+  }];
+}
+
+message AddClusterCidrResp {
+  option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
+    json_schema : {
+      title : "AddSubnetToClusterResp"
+      description : "集群添加cidr网段的返回"
+      required : [ "code", "message" ]
+    }
+  };
+
+  uint32 code = 1[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "code", description : "返回错误码"
+  }];
+  string message = 2[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "message",
+    description : "返回错误信息"
+  }];
+  bool result = 3[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "result", description : "返回结果"
+  }];
+  WebAnnotationsV2 web_annotations = 4 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "web_annotations",
+    description : "用户所属的集群权限"
+  }];
+}
+
 message SwitchClusterUnderlayNetworkReq {
   option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
     json_schema : {
@@ -7650,6 +7730,15 @@ message ListBusinessClusterResp {
   } ];
 }
 
+message ClusterBasicInfoData {
+  uint64 total = 1;
+  repeated ClusterBasicInfo results = 2
+  [ (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "data",
+    description : "集群信息列表"
+  } ];
+}
+
 message ListClusterReq {
   option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
     json_schema : {
@@ -7863,52 +7952,60 @@ message ListClusterV2Req {
       description : "集群类型, 例如[federation, single], "
           "federation表示为联邦集群，single表示独立集群，默认为single"
     }];
-  string status = 9[
+  string manageType = 9[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "manageType", 
+    description: "集群管理类型，公有云时生效，MANAGED_CLUSTER(云上托管集群)，INDEPENDENT_CLUSTER(独立集群，自行维护)"
+  }];
+  string status = 10[
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title: "status",
       description: "集群状态，可能状态CREATING，RUNNING，DELETING，FALURE，INITIALIZATION，DELETED"
     }, (validate.rules).string = {in: ["CREATING", "RUNNING", "DELETING", "FALURE", "INITIALIZATION", "DELETED", ""]}];
-  string systemID = 10 [
+  string systemID = 11 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "systemID",
       description : "cloudID过滤集群"
     },(validate.rules).string.max_len = 100];
-  bool isCommonCluster = 11 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+  bool isCommonCluster = 12 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
     title: "isCommonCluster",
     description: "是否为公共集群,默认false"
   }];
-  string clusterID = 12 [
+  string clusterID = 13 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "clusterID",
       description : "集群ID"
     }];
-  bool all = 13 [
+  string creator = 14[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "creator", 
+    description: "任务创建人"
+  }];
+  bool all = 15 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "all",
       description : "true时获取所有的集群信息,包括被软删除的集群; false时获取非DELETED状态的集群信息"}];
-  uint32 offset = 14 [
+  uint32 page = 16 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
-      title : "offset",
-      description : "查询偏移量"
-    }, (validate.rules).uint32.gte = 0];
-  uint32 limit = 15 [
+      title : "page",
+      description : "页码"
+    }, (validate.rules).uint32.gt = 0];
+  uint32 limit = 17 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "limit",
       description : "查询限制数量"
     }, (validate.rules).uint32.lte = 1000];
-  string clusterName = 16 [
+  string clusterName = 18 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "clusterName",
       description : "集群名称"
     },
     (validate.rules).string.max_len = 100
   ];
-  string sort = 17 [
+  string sort = 19 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "sort",
       description : "根据某个字段排序"
     }];
-  string order = 18 [
+  string order = 20 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "order",
       description : "升序或者降序"
@@ -7938,7 +8035,7 @@ message ListClusterV2Resp {
       { title : "result",
         description : "返回结果"
       }];
-  repeated ClusterBasicInfo data = 4 [
+  ClusterBasicInfoData data = 4 [
     (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
       title : "data",
       description : "简化集群信息列表"}];
@@ -11013,6 +11110,111 @@ message ListTaskResponse {
   }];
 }
 
+message ListTaskV2Request {
+  option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
+    json_schema : {
+      title : "ListTaskV2Request"
+      description : "查询task，如果填写了目标字段，则组合目标信息查询，如果全为空则为查询全量信息"
+    }
+  };
+
+  string clusterID = 1[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "clusterID", 
+    description: "任务所关联的集群，该ID为BCS集群ID"
+  },
+  (validate.rules).string = {max_len : 100}
+  ];
+  string projectID = 2[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "projectID", 
+    description: "任务所关联项目信息"
+  },(validate.rules).string = {max_len : 32}
+  ];
+  string creator = 3[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "creator", 
+    description: "任务创建者"
+  },(validate.rules).string = {max_len : 20}
+  ];
+  string updater = 4[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "updater", 
+    description: "任务更新者"
+  },(validate.rules).string = {max_len : 20}
+  ];
+  string taskType = 5[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "taskType", 
+    description: "任务类型，例如CreateCluster，AddNodesToCluster，DeleteNodesFromCluster等"
+  }];
+  string status = 6[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "status", 
+    description: "任务状态(INITIALIZING, RUNNING, SUCCESS, FAILED, TIMEOUT, FORCETERMINATE)"
+  }];
+  string nodeIP = 7[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "nodeIP",
+    description: "某些场景下通过nodeIP查询对应的任务"
+  }];
+  string nodeGroupID = 8 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "nodeGroupID",
+    description: "通过节点池ID过滤任务列表"
+  }];
+  string message = 9[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "message",
+    description: "事件信息"
+  }];
+  uint64 startTime = 10 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "startTime",
+    description: "开始时间，GMT 时间戳，秒"
+  }];
+  uint64 endTime = 11 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "endTime",
+    description: "结束时间，GMT 时间戳，秒"
+  }];
+  uint32 limit = 12 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "limit",
+    description: "每页数量"
+  }, (validate.rules).uint32.gt = 0];
+  uint32 page = 13 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "page",
+    description: "页码"
+  }, (validate.rules).uint32.gt = 0];
+}
+
+message ListTaskV2Response {
+  option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
+    json_schema : {
+      title : "ListTaskV2Response"
+      description : "查询任务返回"
+      required : [ "code", "message" ]
+    }
+  };
+
+  uint32 code = 1 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "code", 
+    description : "返回错误码"
+  }];
+  string message = 2[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "message",
+    description : "返回错误信息"
+  }];
+  bool result = 3 [ (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "result", 
+    description : "返回结果"
+  }];
+  ListTaskV2ResponseData data = 4 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "data", 
+    description : "获取到的任务列表信息"
+  }];
+}
+
+message ListTaskV2ResponseData {
+  uint32 count = 1[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "count",
+    description : "数量"
+  }];
+  repeated Task results = 2[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "results",
+    description : "返回数据"
+  }];
+}
+
 
 // ClusterAutoScalingOption request & response
 
@@ -12998,6 +13200,71 @@ message ListCloudVpcsResponse {
   }];
 }
 
+message ListRecommendCloudVpcCidrRequest {
+  option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
+    json_schema : {
+      title : "ListRecommendCloudVpcCidrRequest"
+      description : "根据掩码获取云所属地域vpc推荐cidr"
+    }
+  };
+
+  string cloudID = 1 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "cloudID",
+    description : "云信息"
+  },(validate.rules).string = {min_len : 2}];
+  string region = 2 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "region",
+    description : "云地域信息"
+  }];
+  string accountID = 3 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "accountID",
+    description : "云凭证ID"
+  }];
+  string vpcID = 4[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "vpcID",
+    description: "过滤查询指定vpc的信息"
+  }];
+  string networkType = 5[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "networkType",
+    description: "集群网络类型，(underlay/overlay)"
+  }, (validate.rules).string = {in: ["underlay", "overlay"]}];
+  uint32 mask = 6[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title: "mask",
+    description: "申请vpc-cni网络subnet时的网络掩码大小"
+  }];
+}
+
+message ListRecommendCloudVpcCidrResponse {
+  option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
+    json_schema : {
+      title : "ListRecommendCloudVpcCidrResponse"
+      description : "根据掩码获取云所属地域vpc推荐cidr"
+      required : [ "code", "message" ]
+    }
+  };
+
+  uint32 code = 1 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "code",
+    description : "返回错误码"
+  }];
+  string message = 2[(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "message",
+    description : "返回错误信息"
+  }];
+  bool result = 3 [ (grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "result",
+    description : "返回结果"
+  }];
+  CidrInfo data = 4 [(grpc.gateway.protoc_gen_swagger.options.openapiv2_field) = {
+    title : "data",
+    description : "获取到的cidr列表信息"
+  }];
+}
+
+message CidrInfo {
+  repeated string cidrs=1;
+}
+
 message CloudVpc {
   string name=1;
   string vpcId=2;