Skip to content

Commit f7760af

Browse files
authored
Prevent fixed-address resolutions from ending (#945)
When a controller client is configured with a fixed IP address and not a resolveable name, we build that client with a resolution that terminates immediately after the client is configured with the fixed address. This causes warnings to be emmited even though the client is configured properly. This change updates theses resolutions to avoid termination so these warnings are not logged.
1 parent acf250f commit f7760af

File tree

1 file changed

+2
-1
lines changed
  • linkerd/proxy/dns-resolve/src

1 file changed

+2
-1
lines changed

linkerd/proxy/dns-resolve/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ impl<T: Param<Addr>> tower::Service<T> for DnsResolve {
5454
Addr::Name(na) => Box::pin(resolution(self.dns.clone(), na).in_current_span()),
5555
Addr::Socket(sa) => {
5656
let eps = vec![(sa, ())];
57-
let updates: UpdateStream = Box::pin(stream::iter(Some(Ok(Update::Reset(eps)))));
57+
let updates: UpdateStream =
58+
Box::pin(stream::iter(Some(Ok(Update::Reset(eps)))).chain(stream::pending()));
5859
Box::pin(future::ok(updates))
5960
}
6061
}

0 commit comments

Comments
 (0)