ConcreteAddrs are now always available

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
linkerd · Apr 6, 2021 · 4720c62 · 4720c62
1 parent f7fb6bc
commit 4720c62
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/linkerd/service-profiles/src/split.rs b/linkerd/service-profiles/src/split.rs
@@ -54,7 +54,7 @@ impl<N: Clone, S, Req> Clone for NewSplit<N, S, Req> {
 impl<T, N, S, Req> NewService<T> for NewSplit<N, S, Req>
 where
     T: Clone + Param<LookupAddr> + Param<Receiver>,
-    N: NewService<(Option<ConcreteAddr>, T), Service = S> + Clone,
+    N: NewService<(ConcreteAddr, T), Service = S> + Clone,
     S: tower::Service<Req>,
     S::Error: Into<Error>,
 {
@@ -76,7 +76,7 @@ where
         for Target { weight, addr } in targets.into_iter() {
             services.push(
                 addr.clone(),
-                new_service.new_service((Some(ConcreteAddr(addr.clone())), target.clone())),
+                new_service.new_service((ConcreteAddr(addr.clone()), target.clone())),
             );
             addrs.insert(addr);
             weights.push(weight);
@@ -140,7 +140,7 @@ where
                     debug!(%addr, "Creating target");
                     let svc = self
                         .new_service
-                        .new_service((Some(ConcreteAddr(addr.clone())), self.target.clone()));
+                        .new_service((ConcreteAddr(addr.clone()), self.target.clone()));
                     self.services.push(addr.clone(), svc);
                 } else {
                     trace!(%addr, "Target already exists");