Skip to content

Commit

Permalink
move plugin proto updating into make update
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Kriss <[email protected]>
  • Loading branch information
skriss committed Sep 18, 2019
1 parent fdd04b4 commit 489ba7a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
17 changes: 15 additions & 2 deletions hack/build-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2018 the Velero contributors.
# Copyright 2018, 2019 the Velero contributors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -25,4 +25,17 @@ RUN mkdir -p /go/src/k8s.io && \
cd /go/src/golang.org/x/tools && \
git checkout 40a48ad93fbe707101afb2099b738471f70594ec && \
go install ./cmd/goimports && \
echo chmod -R a+w /go
echo chmod -R a+w /go && \
# download & install protoc
apt-get update && apt-get install -y unzip && \
wget --quiet https://github.com/protocolbuffers/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip && \
unzip protoc-3.9.1-linux-x86_64.zip && \
mv bin/protoc /usr/bin/protoc && \
chmod +x /usr/bin/protoc && \
# download & install protoc-gen-go plugin (v1.0.0)
mkdir -p /go/src/github.com/golang && \
cd /go/src/github.com/golang && \
git config --global advice.detachedHead false && \
git clone -b v1.0.0 https://github.com/golang/protobuf && \
cd /go/src/github.com/golang/protobuf && \
go install ./protoc-gen-go
6 changes: 3 additions & 3 deletions hack/generate-proto.sh → hack/update-proto.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -e
#
# Copyright 2017 the Velero contributors.
# Copyright 2017, 2019 the Velero contributors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -16,8 +16,8 @@

HACK_DIR=$(dirname "${BASH_SOURCE}")

echo "Running protoc"
echo "Updating plugin proto"

protoc pkg/plugin/proto/*.proto --go_out=plugins=grpc:pkg/plugin/generated/ -I pkg/plugin/proto/

echo "Success!"
echo "Updating plugin proto - done!"
7 changes: 1 addition & 6 deletions site/docs/master/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ Run `make update` to regenerate files if you make the following changes:
* Add/edit/remove command line flags and/or their help text
* Add/edit/remove commands or subcommands
* Add new API types

Run [generate-proto.sh][13] to regenerate files if you make the following changes:

* Add/edit/remove protobuf message or service definitions. These changes require the [proto compiler][14] and compiler plugin `protoc-gen-go` version v1.0.0.
* Add/edit/remove plugin protobuf message or service definitions

The following files are automatically generated from the source code:

Expand All @@ -31,5 +28,3 @@ To run unit tests, use `make test`.
If you need to add or update the vendored dependencies, see [Vendoring dependencies][11].

[11]: vendoring-dependencies.md
[13]: https://github.com/heptio/velero/blob/master/hack/generate-proto.sh
[14]: https://grpc.io/docs/quickstart/go.html#install-protocol-buffers-v3

0 comments on commit 489ba7a

Please sign in to comment.