Skip to content

Commit c63a4f2

Browse files
authored
Upgrade gogo/protobuf to 1.3.0 (#2055)
* Upgrade gogo/protobuf to 1.3.0 Signed-off-by: Cyril Tovena <[email protected]>
1 parent 3510de1 commit c63a4f2

File tree

20 files changed

+2108
-1418
lines changed

20 files changed

+2108
-1418
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
# https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
44
defaults: &defaults
55
docker:
6-
- image: quay.io/cortexproject/build-image:validate-k8s-specs-7c217ee7
6+
- image: quay.io/cortexproject/build-image:update-gogoproto-9a1b26ac6
77
working_directory: /go/src/github.com/cortexproject/cortex
88

99
filters: &filters

build-image/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN curl -sfL https://github.com/raw/golangci/golangci-lint/master/in
1616
RUN GO111MODULE=on go get -tags netgo \
1717
github.com/client9/misspell/cmd/[email protected] \
1818
github.com/golang/protobuf/[email protected] \
19-
github.com/gogo/protobuf/protoc-gen-gogoslick@v1.2.1 \
20-
github.com/gogo/protobuf/gogoproto@v1.2.1 && \
19+
github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 \
20+
github.com/gogo/protobuf/gogoproto@v1.3.0 && \
2121
rm -rf /go/pkg /go/src
2222

2323
ENV KUBEVAL_VERSION=0.14.0

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ require (
6363
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
6464
github.com/uber/jaeger-client-go v2.20.1+incompatible
6565
github.com/weaveworks/billing-client v0.0.0-20171006123215-be0d55e547b1
66-
github.com/weaveworks/common v0.0.0-20200201141823-27e183090ab1
66+
github.com/weaveworks/common v0.0.0-20200206153930-760e36ae819a
6767
go.etcd.io/bbolt v1.3.3
6868
go.etcd.io/etcd v0.0.0-20190709142735-eb7dd97135a5
6969
go.uber.org/atomic v1.5.0

go.sum

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
313313
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
314314
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48 h1:X+zN6RZXsvnrSJaAIQhZezPfAfvsqihKKR8oiLHid34=
315315
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
316+
github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
316317
github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
317318
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
318319
github.com/gogo/status v1.0.3 h1:WkVBY59mw7qUNTr/bLwO7J2vesJ0rQ2C3tMXrTd3w5M=
@@ -773,8 +774,8 @@ github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6
773774
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
774775
github.com/weaveworks/billing-client v0.0.0-20171006123215-be0d55e547b1 h1:qi+YkNiB7T3Ikw1DoDIFhdAPbDU7fUPDsKrUoZdupnQ=
775776
github.com/weaveworks/billing-client v0.0.0-20171006123215-be0d55e547b1/go.mod h1:7gGdEUJaCrSlWi/mjd68CZv0sfqektYPDcro9cE+M9k=
776-
github.com/weaveworks/common v0.0.0-20200201141823-27e183090ab1 h1:nhoCrldzSm1le34sZfSNyTELYxIDaAmDw6PPVoEj5Mw=
777-
github.com/weaveworks/common v0.0.0-20200201141823-27e183090ab1/go.mod h1:KLGX4H1D0lPVfHS/hqO9yrKvDzaT0bqYftIW43iLaOc=
777+
github.com/weaveworks/common v0.0.0-20200206153930-760e36ae819a h1:4Sm4LnEnP1yQ2NeNgGqLTuN2xrTvcBOU+EsljpB8Ed0=
778+
github.com/weaveworks/common v0.0.0-20200206153930-760e36ae819a/go.mod h1:6enWAqfQBFrE8X/XdJwZr8IKgh1chStuFR0mjU/UOUw=
778779
github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
779780
github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
780781
github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=

pkg/alertmanager/alerts/alerts.pb.go

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

0 commit comments

Comments
 (0)