Skip to content

specify target service hostname instead of address for waypoint dest #1776

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

Draft
garrettheel wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

specify target service hostname instead of address for waypoint dest #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions src/proxy/outbound.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,8 @@ impl OutboundConnection {
// bytes without trying to interpret it.
//
// NOTE: when connecting through an E/W gateway, regardless of whether there is
// a waypoint or not, we always use service hostname and the service port. It's
// somewhat different from how regular HBONE works, so I'm calling it out here.
// a waypoint or not, we always use service hostname and the service port.
// This is also the case for service-addressed waypoint traffic (see build_request).
async fn build_request_through_gateway(
&self,
source: Arc<Workload>,
Expand Down Expand Up @@ -578,7 +578,10 @@ impl OutboundConnection {
return Ok(Request {
protocol: OutboundProtocol::HBONE,
source: source_workload,
hbone_target_destination: Some(HboneAddress::SocketAddr(target)),
hbone_target_destination: Some(HboneAddress::SvcHostname(
target_service.hostname.clone(),
target.port(),
)),
actual_destination_workload: Some(waypoint.workload),
intended_destination_service: Some(ServiceDescription::from(&*target_service)),
actual_destination,
Expand Down Expand Up @@ -1515,6 +1518,7 @@ mod tests {
"127.0.0.1",
"127.0.0.3:80",
XdsAddressType::Service(XdsService {
hostname: "my-svc.default.svc.cluster.local".to_string(),
addresses: vec![XdsNetworkAddress {
network: "".to_string(),
address: vec![127, 0, 0, 3],
Expand All @@ -1534,10 +1538,10 @@ mod tests {
}),
..Default::default()
}),
// Should use the waypoint
// Should use the waypoint with service hostname as authority
Some(ExpectedRequest {
protocol: OutboundProtocol::HBONE,
hbone_destination: "127.0.0.3:80",
hbone_destination: "my-svc.default.svc.cluster.local:80",
destination: "127.0.0.10:15008",
}),
)
Expand Down Expand Up @@ -1879,7 +1883,7 @@ mod tests {
"127.0.0.1",
"1.2.3.4:80",
XdsAddressType::Service(XdsService {
hostname: "example.com".to_string(),
hostname: "my-svc.default.svc.cluster.local".to_string(),
waypoint: Some(xds::istio::workload::GatewayAddress {
destination: Some(xds::istio::workload::gateway_address::Destination::Address(
XdsNetworkAddress {
Expand Down Expand Up @@ -1912,7 +1916,7 @@ mod tests {
Some(ExpectedRequest {
protocol: OutboundProtocol::HBONE,
destination: "127.0.0.10:15008",
hbone_destination: "1.2.3.4:80",
hbone_destination: "my-svc.default.svc.cluster.local:80",
}),
)
.await;
Expand Down
4 changes: 2 additions & 2 deletions tests/namespaced.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,13 +447,13 @@ mod namespaced {

let sent = format!("{REQ_SIZE}");
let recv = format!("{HBONE_REQ_SIZE}");
let hbone_addr = format!("{TEST_VIP}:80");
let hbone_addr = "service.default.svc.cluster.local:80";
let dst_addr = format!("{waypoint_ip}:15008");
let want = HashMap::from([
("scope", "access"),
("src.workload", "client"),
("dst.workload", "waypoint"),
("dst.hbone_addr", &hbone_addr),
("dst.hbone_addr", hbone_addr),
("dst.addr", &dst_addr),
("bytes_sent", &sent),
("bytes_recv", &recv),
Expand Down