Skip to content

Commit 4a64e23

Browse files
yati1998mergify[bot]
authored andcommitted
changes the conflicting names
This commit changes the package name as this was conflicting with proto file in csi-addons spec. This commit also changes Node/ControllerReclaimSpaceRequest to single request as the structure was same resulting in error. Signed-off-by: yati1998 <ypadia@redhat.com>
1 parent 1c16554 commit 4a64e23

File tree

3 files changed

+82
-161
lines changed

3 files changed

+82
-161
lines changed

internal/service/reclaimspace/reclaimspace.pb.go renamed to internal/proto/reclaimspace.pb.go

Lines changed: 57 additions & 129 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/service/reclaimspace/reclaimspace.proto renamed to internal/proto/reclaimspace.proto

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
syntax = "proto3";
2-
package reclaimspace;
2+
package proto;
33

4-
option go_package = "github.com/csi-addons/kubernetes-csi-addons/internal/service/reclaimspace";
4+
option go_package = "github.com/csi-addons/kubernetes-csi-addons/internal/proto";
55

66
// ReclaimSpace holds the RPC menthod for allowing the
77
// communication between the CSIAddons controller and the sidecar.
88
service ReclaimSpace {
99
// ControllerReclaimSpace is a procedure that gets called on the CSI
1010
// sidecar.
11-
rpc ControllerReclaimSpace (ControllerReclaimSpaceRequest) returns(ReclaimSpaceResponse) {}
11+
rpc ControllerReclaimSpace (ReclaimSpaceRequest) returns(ReclaimSpaceResponse) {}
1212

1313
// NodeReclaimSpace is a procedure that gets called on the CSI
1414
// sidecar.
15-
rpc NodeReclaimSpace (NodeReclaimSpaceRequest) returns(ReclaimSpaceResponse) {}
15+
rpc NodeReclaimSpace (ReclaimSpaceRequest) returns(ReclaimSpaceResponse) {}
1616

1717
}
18-
// ControllerReclaimSpaceRequest contains the information i.e., pv_name
18+
// ReclaimSpaceRequest contains the information i.e., pv_name
1919
// received from the CSIAddons controller for performing the reclaim operation.
20-
message ControllerReclaimSpaceRequest {
20+
message ReclaimSpaceRequest {
2121
// The name of the pv. This field is REQUIRED.
2222
string pv_name = 1;
2323
}
@@ -34,13 +34,6 @@ message ReclaimSpaceResponse {
3434
StorageConsumption post_usage = 2;
3535
}
3636

37-
// NodeReclaimSpaceRequest contains the information i.e., pv_name
38-
// received from the CSIAddons controller for performing the reclaim operation.
39-
message NodeReclaimSpaceRequest {
40-
// The name of the pv. This field is REQUIRED.
41-
string pv_name = 1;
42-
}
43-
4437
// StorageConsumption contains the usage in bytes.
4538
message StorageConsumption {
4639
// This field is REQUIRED. usage_bytes contains the consumed storage in

0 commit comments

Comments
 (0)