[etcd] Downgrade to release-3.5 branch with otel fix. #4139
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
See etcd-io/etcd#14312 for details of the needed PR. Rewrite integration package imports from the 3.6.0.alpha.0 path to the 3.5.5 path. Incidentally remove the go.etcd.io/etcd/client/v2 replace directive since M3 is already on go 1.17 and release-3.5 branch indirectly pulls in v2.305.4 which does exhibit the problem with sigs.k8s.io/json: ``` % go mod why sigs.k8s.io/json (main module does not need package sigs.k8s.io/json) ``` Signed-off-by: Zack Train <ztrain@uber.com>
Signed-off-by: Zack Train <ztrain@uber.com>
Signed-off-by: Zack Train <ztrain@uber.com>
|
@andrewmains12 Please let me know if I should re-do this against a non-master branch. |
|
Going to merge this temporarily into an Uber specific branch; will revive the PR against master shortly. |
andrewmains12
changed the base branch from
master
to
uber/20220816-grpc_update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See etcd-io/etcd#14312 for details of the needed
PR in etcd. Rewrite integration package imports from the 3.6.0.alpha.0 path to
the 3.5.5 path. Incidentally remove the go.etcd.io/etcd/client/v2 replace directive
since M3 is already on go 1.17 and release-3.5 branch indirectly pulls
in v2.305.4 which does exhibit the problem with sigs.k8s.io/json:
Signed-off-by: Zack Train ztrain@uber.com