Skip to content

Loadbalance requests to control plane #594

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

Merged
merged 30 commits into from
Aug 26, 2020
Merged

Loadbalance requests to control plane #594

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2432f57
Put initial dns resolver in
zaharidichev Jul 10, 2020
43415ff
Actually diff addresses
zaharidichev Jul 13, 2020
61f98a2
Attempt at async stream
zaharidichev Jul 14, 2020
065d9a4
Clean up types
zaharidichev Jul 14, 2020
7b7cca6
Address comments
zaharidichev Jul 17, 2020
29e410a
Remove queue
zaharidichev Jul 21, 2020
00def7b
Add debug statements
zaharidichev Jul 21, 2020
33d4ec8
Address more comments
zaharidichev Jul 24, 2020
ca34051
Remove Resolve trait
zaharidichev Jul 27, 2020
11059ae
Use named fields
zaharidichev Jul 27, 2020
abff97f
Merge branch 'main' into zd/control-plane-discover
olix0r Jul 28, 2020
45c66a8
Merge branch 'main' into zd/control-plane-discover
olix0r Aug 20, 2020
63f2b9c
fix test import
olix0r Aug 20, 2020
2c653b9
Decouple discovery buffering from endpoint conversion
olix0r Aug 20, 2020
621ed49
Do not buffer control plane discovery
olix0r Aug 20, 2020
3829258
Cleanup imports
olix0r Aug 20, 2020
d87c400
Resolve cp components via SRV records
zaharidichev Aug 24, 2020
3d3fc19
Merge branch 'main' into zd/control-plane-discover
olix0r Aug 24, 2020
d2b4f08
Use Reset instead of Empty
olix0r Aug 24, 2020
ad9ab78
map to Target
zaharidichev Aug 24, 2020
f654f24
fixup! Use Reset instead of Empty
olix0r Aug 24, 2020
9281ada
Merge branch 'zd/control-plane-discover' of github.com:linkerd/linker…
olix0r Aug 24, 2020
a814432
fixup
olix0r Aug 24, 2020
88af1f2
Control plane load balancing (#636)
olix0r Aug 25, 2020
bc9a102
Merge branch 'main' into zd/control-plane-discover
olix0r Aug 25, 2020
b1a9d19
Reduce boilerplate by moving builders into core::control
olix0r Aug 25, 2020
4c88ee1
pull changes from main
olix0r Aug 26, 2020
3236607
Unused async-stream dep
olix0r Aug 26, 2020
59e5ef0
Unused async-trait dep
olix0r Aug 26, 2020
6994344
Remove unused ResolutionFailed
olix0r Aug 26, 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: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,7 @@ dependencies = [
name = "linkerd2-app-core"
version = "0.1.0"
dependencies = [
"async-stream",
"async-trait",
"bytes 0.5.4",
"futures 0.3.5",
Expand Down Expand Up @@ -974,6 +975,7 @@ version = "0.1.0"
name = "linkerd2-dns"
version = "0.1.0"
dependencies = [
"async-trait",
"futures 0.3.5",
"linkerd2-dns-name",
"linkerd2-stack",
Expand Down
3 changes: 2 additions & 1 deletion linkerd/app/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ independently of the inbound and outbound proxy logic.
mock-orig-dst = ["linkerd2-proxy-transport/mock-orig-dst"]

[dependencies]
async-stream = "0.2.1"
async-trait = "0.1"
bytes = "0.5"
http = "0.2"
Expand Down Expand Up @@ -63,7 +64,7 @@ linkerd2-stack-tracing = { path = "../../stack/tracing" }
linkerd2-trace-context = { path = "../../trace-context" }
rand = { version = "0.7", features = ["small_rng"] }
regex = "1.0.0"
tokio = { version = "0.2", features = ["macros", "sync", "parking_lot"]}
tokio = { version = "0.2", features = ["macros", "sync", "parking_lot", "test-util"]}
tokio-timer = "0.2"
tower-request-modifier = { git = "https://github.com/tower-rs/tower-http" }
tonic = { version = "0.2", default-features = false, features = ["prost"] }
Expand Down
Loading