Skip to content

Commit

Permalink
Fixed proto gen.
Browse files Browse the repository at this point in the history
Signed-off-by: Bartlomiej Plotka <[email protected]>
  • Loading branch information
bwplotka committed May 20, 2020
1 parent 4241001 commit 3318116
Show file tree
Hide file tree
Showing 10 changed files with 5,029 additions and 142 deletions.
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,8 @@ replace (
// Make sure Cortex is not forcing us to some other Prometheus version.
github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20200110114423-1e64d757f711 // master ~ v2.15.2
k8s.io/api => k8s.io/api v0.0.0-20190620084959-7cf5895f2711
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190620085554-14e95df34f1f
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/klog => k8s.io/klog v0.3.1
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
)
Expand Down
36 changes: 18 additions & 18 deletions pkg/store/hintspb/hints.pb.go

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

10 changes: 1 addition & 9 deletions pkg/store/storepb/prompb/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
NOTE(bwplotka): This excerpt of "github.com/prometheus/prometheus/prompb" reconstructed to avoid XXX fields for unsafe conversion to safe allocs.

The compiled protobufs are version controlled and you won't normally need to
re-compile them when building Prometheus.

If however you have modified the defs and do need to re-compile, run
`make proto` from the parent dir.

In order for the script to run, you'll need `protoc` (version 3.5.1) in your
PATH.

Controlled by `make proto`
87 changes: 44 additions & 43 deletions pkg/store/storepb/prompb/remote.pb.go

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

2 changes: 1 addition & 1 deletion pkg/store/storepb/prompb/remote.proto
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package prometheus_copy;

option go_package = "prompb";

import "types.proto";
import "store/storepb/prompb/types.proto";
import "gogoproto/gogo.proto";

// Do not generate XXX fields to reduce memory footprint and opening a door
Expand Down
Loading

0 comments on commit 3318116

Please sign in to comment.