diff options
| author | Andreas Eriksen <andreer@verizonmedia.com> | 2019-09-10 11:24:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-10 11:24:05 +0200 |
| commit | 0c72768ea7290ebd3792201636bdca3b005ddf82 (patch) | |
| tree | e9b16a6bda463c6acbac7fc229dc203cda898ce0 /controller-server | |
| parent | 32feba98fc8ec7dc1ca0fccd14af267765bdca95 (diff) | |
| parent | 0e4c01364c52ebe845249ca230bd86f1212565b4 (diff) | |
Merge pull request #10221 from vespa-engine/revert-10220-jvenstad/http-443-in-public-for-now
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 2f8c08c15be..f1e4e719eae 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 @@ -418,9 +418,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. */ |