Skip to content

Commit

Permalink
resolve: Do not send the 'k8s' scheme (#356)
Browse files Browse the repository at this point in the history
The fact that the proxy sends resolve requests with a scheme value of
`k8s` is an accident of history. Given that this value is currently
unused by the controller, stop setting a scheme value entirely.
  • Loading branch information
olix0r authored Sep 18, 2019
1 parent 58a3403 commit dc3c600
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion src/app/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ where
};

let resolver = crate::api_resolve::Resolve::new(dst_svc.clone())
.with_scheme("k8s")
.with_context_token(&config.destination_context);

let (tap_layer, tap_grpc, tap_daemon) = tap::new();
Expand Down
2 changes: 1 addition & 1 deletion src/app/profiles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ where
};

let req = api::GetDestination {
scheme: "k8s".to_owned(),
path: self.dst.clone(),
context_token: self.context_token.clone(),
..Default::default()
};
debug!("getting profile: {:?}", req);
let rspf = self.service.get_profile(grpc::Request::new(req));
Expand Down
3 changes: 0 additions & 3 deletions tests/support/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ impl Controller {
format!("{}:80", dest)
};
let dst = pb::GetDestination {
scheme: "k8s".into(),
path,
..Default::default()
};
Expand All @@ -94,7 +93,6 @@ impl Controller {
format!("{}:80", dest)
};
let dst = pb::GetDestination {
scheme: "k8s".into(),
path,
..Default::default()
};
Expand Down Expand Up @@ -145,7 +143,6 @@ impl Controller {
format!("{}:80", dest)
};
let dst = pb::GetDestination {
scheme: "k8s".into(),
path,
..Default::default()
};
Expand Down

0 comments on commit dc3c600

Please sign in to comment.