Skip to content

Commit ca74c37

Browse files
authored
Merge pull request #65 from manueltellez/master
Implementing volume v1beta1 api including VolumeStats api
2 parents 1988711 + 9d3d0ec commit ca74c37

File tree

25 files changed

+2894
-639
lines changed

25 files changed

+2894
-639
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ generate-protobuf:
3030
protoc -I "$(GOPATH)/src/" -I '$(REPO_ROOT)/client/api' "$$FILE" --go_out=plugins="grpc:$(GOPATH)/src"; \
3131
} ; \
3232
export -f generate_protobuf_for; \
33-
find '$(REPO_ROOT)' -name '*.proto' | sed -e "s|$(GOPATH)/src/||g" | xargs -n1 $(SHELL) -c 'generate_protobuf_for "$$0"'
33+
find '$(REPO_ROOT)' -name '*.proto' | sed -e "s|$(GOPATH)/src/||g" | xargs -n1 '$(SHELL)' -c 'generate_protobuf_for "$$0"'
3434

3535
.PHONY: generate-csi-proxy-api-gen
3636
generate-csi-proxy-api-gen: compile-csi-proxy-api-gen
@@ -41,11 +41,11 @@ clean: clean-protobuf clean-generated
4141

4242
.PHONY: clean-protobuf
4343
clean-protobuf:
44-
find '$(REPO_ROOT)' -name '*.proto' -exec $(SHELL) -c 'rm -vf "$$(dirname {})/$$(basename {} .proto).pb.go"' \;
44+
find '$(REPO_ROOT)' -name '*.proto' -exec '$(SHELL)' -c 'rm -vf "$$(dirname {})/$$(basename {} .proto).pb.go"' \;
4545

4646
.PHONY: clean-generated
4747
clean-generated:
48-
find '$(REPO_ROOT)' -name '*_generated.go' -exec $(SHELL) -c '[[ "$$(head -n 1 "{}")" == "// Code generated by csi-proxy-api-gen"* ]] && rm -v {}' \;
48+
find '$(REPO_ROOT)' -name '*_generated.go' -exec '$(SHELL)' -c '[[ "$$(head -n 1 "{}")" == "// Code generated by csi-proxy-api-gen"* ]] && rm -v {}' \;
4949

5050
# see https://github.com/golangci/golangci-lint/releases
5151
GOLANGCI_LINT_VERSION = v1.21.0

client/api/disk/v1alpha1/api.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ message RescanResponse {
5151
// Intentionally empty
5252
}
5353

54-
5554
message GetDiskNumberByNameRequest {
5655
// Disk ID
5756
string disk_name = 1;

0 commit comments

Comments
 (0)