Skip to content

WIP (no review yet): update etcd + GRPC deps.#4074

Closed
andrewmains12 wants to merge 15 commits intomasterfrom
amains/grpcUpdate
Closed

WIP (no review yet): update etcd + GRPC deps.#4074
andrewmains12 wants to merge 15 commits intomasterfrom
amains/grpcUpdate

Conversation

@andrewmains12
Copy link
Copy Markdown
Contributor

Draft PR to update GRPC + etcd; very subject to change.

zmt and others added 14 commits February 16, 2022 04:02
```
% go mod edit -dropreplace google.golang.org/grpc
% go mod download
```
```
% go mod edit \
  -dropreplace go.etcd.io/etcd/server/v3 \
  -replace=go.etcd.io/etcd/server/v3=go.etcd.io/etcd/server/v3@main
% go mod download
```
We did this on go-code also:
```
% go mod edit \
  -replace=github.com/envoyproxy/go-control-plane=github.com/envoyproxy/[email protected]
```
```
% go mod edit \
  -dropreplace go.etcd.io/etcd/pkg/v3 \
  -replace=go.etcd.io/etcd/pkg/v3=go.etcd.io/etcd/pkg/v3@main
% go mod edit \
  -replace=google.golang.org/grpc=google.golang.org/[email protected]
& go mod tidy
```
```
% go mod edit \
    -droprequire=go.etcd.io/etcd/server/v3 \
    -require=go.etcd.io/etcd/server/[email protected]
```
```
go get go.etcd.io/etcd/api/v3
go get go.etcd.io/etcd/client/pkg/v3
go mod tidy
```
go mod edit -dropreplace go.etcd.io/etcd/server/v3
Replace everything to bleeding edge etcd

+replace go.etcd.io/etcd/server/v3 => go.etcd.io/etcd/server/v3 v3.5.0-alpha.0.0.20220215220652-e814f6f78a12
+
+replace go.etcd.io/etcd/client/v3 => go.etcd.io/etcd/client/v3 v3.5.0-alpha.0.0.20220215220652-e814f6f78a12
+
+replace go.etcd.io/etcd/api/v3 => go.etcd.io/etcd/api/v3 v3.5.0-alpha.0.0.20220215220652-e814f6f78a12
+
+replace go.etcd.io/etcd/client/pkg/v3 => go.etcd.io/etcd/client/pkg/v3 v3.0.0-20220215220652-e814f6f78a12
@CLAassistant
Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ andrewmains12
❌ zmt
You have signed the CLA already but the status is still pending? Let us recheck it.

Comment thread go.mod
Comment on lines +94 to +98
// go.opentelemetry.io/otel/bridge/opentracing v1.0.0-RC2
// go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC2
// go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0-RC2
// go.opentelemetry.io/otel/internal/metric v0.22.0 // indirect
// go.opentelemetry.io/otel/sdk v1.0.0-RC2
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I forgot to delete the commented lines.

Manually drop all etcd replaces.

```
go mod edit -replace=go.etcd.io/etcd/client/v2=go.etcd.io/etcd/client/[email protected]

go get 	go.etcd.io/etcd/api/[email protected]  \
    go.etcd.io/etcd/client/pkg/[email protected] \
       	go.etcd.io/etcd/client/[email protected] \
       	go.etcd.io/etcd/server/[email protected] \
       	go.etcd.io/etcd/tests/[email protected]
```
@andrewmains12
Copy link
Copy Markdown
Contributor Author

Closing this for now in favor of #4087

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants