summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-03-13 08:55:06 +0100
committerGitHub <noreply@github.com>2020-03-13 08:55:06 +0100
commit4af2421be94bc1ff71b5d26185a918088a907ee8 (patch)
treebc985223e664d909e872ceb5263b4a551f6d7296
parentb9db32e421399835024efe5f800e7fa6f63f6735 (diff)
parent8d639e7f5da8401677095b9253cd51a60a0bd0d5 (diff)
Merge pull request #12555 from vespa-engine/mpolden/reduce-cd-restrictions
Do not restrict endpoints in CD
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index 6634b7ef81e..c92157eac9f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -276,6 +276,7 @@ public class RoutingController {
/** Returns whether traffic can be directly routed to given deployment */
private boolean canRouteDirectlyTo(DeploymentId deploymentId, Application application) {
if (controller.system().isPublic()) return true; // Public always supports direct routing
+ if (controller.system().isCd()) return true; // CD deploys directly so we cannot enforce all requirements below
// Check Athenz service presence. The test framework uses this identity when sending requests to the
// deployment's container(s).