diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-08-09 12:30:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 12:30:54 +0200 |
| commit | 0e4c01364c52ebe845249ca230bd86f1212565b4 (patch) | |
| tree | 1568524a3b55651bffe066c6fe9d592457d64df2 /controller-server | |
| parent | 942a5e956b0a143d122d7aa89e4c87c750fe82ec (diff) | |
Revert "Public deployments have no valid web cert yet — work around this"
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 36af5303ed4..c644af2e554 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -413,9 +413,7 @@ public class JobController { .stream().findAny() .or(() -> controller.applications().routingPolicies().get(testerId).stream() .findAny() - .map(policy -> policy.endpointIn(controller.system()).url())) - // TODO jvenstad: Remove ugly thing when public deployments have a valid web certificate. - .map(uri -> controller.system().isPublic() ? URI.create("http://" + uri.getHost() + ":443/") : uri); + .map(policy -> policy.endpointIn(controller.system()).url())); } /** Returns a set containing the zone of the deployment tested in the given run, and all production zones for the application. */ |