Skip to content

Commit fa20ff1

Browse files
authored
Merge pull request #134 from mauriciopoppe/v1-to-v1betaX
Rename unreleased v1 client apis to v1betaX
2 parents 9e1e33d + 6dff405 commit fa20ff1

File tree

66 files changed

+4558
-4048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+4558
-4048
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ 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)' -not -path './vendor/*' -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
37-
$(CSI_PROXY_API_GEN) -i github.com/kubernetes-csi/csi-proxy/client/api,github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy
37+
$(CSI_PROXY_API_GEN) -i github.com/kubernetes-csi/csi-proxy/client/api,github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy --v=5
3838

3939
.PHONY: clean
4040
clean: clean-protobuf clean-generated

client/api/disk/v1/api.pb.go renamed to client/api/disk/v1beta3/api.pb.go

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

client/api/disk/v1/api.proto renamed to client/api/disk/v1beta3/api.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
syntax = "proto3";
22

3-
package v1;
3+
package v1beta3;
44

5-
option go_package = "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1";
5+
option go_package = "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3";
66

77
service Disk {
88
// ListDiskLocations returns locations <Adapter, Bus, Target, LUN ID> of all

client/api/errors.pb.go

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

client/api/errors.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ syntax = "proto3";
22

33
package api;
44

5+
option go_package = "github.com/kubernetes-csi/csi-proxy/client/api";
6+
57
// CommandError details errors yielded by cmdlet calls.
68
message CmdletError {
79
// Name of the cmdlet that errored out.

0 commit comments

Comments
 (0)