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.

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

thanos: upgrade dependency and default to v0.5.0 #2633

Merged
merged 2 commits into from Jun 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/thanos/prometheus.yaml
Expand Up @@ -14,4 +14,4 @@ spec:
role: prometheus-rulefiles
prometheus: k8s
thanos:
version: v0.4.0
version: v0.5.0
2 changes: 1 addition & 1 deletion example/thanos/query-deployment.yaml
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: thanos-query
image: improbable/thanos:v0.4.0
image: improbable/thanos:v0.5.0
args:
- query
- --log.level=debug
Expand Down
11 changes: 4 additions & 7 deletions go.mod
Expand Up @@ -14,22 +14,19 @@ require (
github.com/go-openapi/jsonreference v0.19.0 // indirect
github.com/go-openapi/spec v0.17.2
github.com/go-openapi/swag v0.17.2 // indirect
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/protobuf v1.2.0
github.com/golang/protobuf v1.3.1
github.com/googleapis/gnostic v0.1.0 // indirect
github.com/hashicorp/go-version v1.1.0
github.com/imdario/mergo v0.3.5 // indirect
github.com/improbable-eng/thanos v0.4.0
github.com/improbable-eng/thanos v0.5.0
github.com/jsonnet-bundler/jsonnet-bundler v0.1.0
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452
github.com/oklog/run v1.0.0
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.2
github.com/prometheus/prometheus v0.0.0-20190328180107-4d60eb36dcbe
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
github.com/prometheus/prometheus v2.9.2+incompatible
Copy link
Contributor Author

@abursavich abursavich Jun 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: I hadn't seen the +incompatible suffix before and it worried me for a minute, but it's okay: https://github.com/golang/go/wiki/Modules#can-a-module-consume-a-v2-package-that-has-not-opted-into-modules-what-does-incompatible-mean

github.com/stretchr/testify v1.3.0
golang.org/x/crypto v0.0.0-20190424203555-c05e17bb3b2d // indirect
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 // indirect
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20190425145619-16072639606e // indirect
Expand Down
227 changes: 134 additions & 93 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/prometheus/statefulset.go
Expand Up @@ -35,7 +35,7 @@ import (
const (
governingServiceName = "prometheus-operated"
DefaultPrometheusVersion = "v2.7.1"
DefaultThanosVersion = "v0.4.0"
DefaultThanosVersion = "v0.5.0"
defaultRetention = "24h"
defaultReplicaExternalLabelName = "prometheus_replica"
storageDir = "/prometheus"
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/golang/protobuf/proto/decode.go

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

63 changes: 63 additions & 0 deletions vendor/github.com/golang/protobuf/proto/deprecated.go

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

3 changes: 2 additions & 1 deletion vendor/github.com/golang/protobuf/proto/equal.go

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

78 changes: 71 additions & 7 deletions vendor/github.com/golang/protobuf/proto/extensions.go

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

38 changes: 12 additions & 26 deletions vendor/github.com/golang/protobuf/proto/lib.go

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