diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-02-25 15:07:53 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-02-25 15:07:53 +0100 |
| commit | 035651fade6aba9bdcfdcd43d52e01f9c42382a9 (patch) | |
| tree | 3ad1b48967797c372342874e860904535905060d /config-provisioning | |
| parent | 58ccc5ac198042ac8b64647b3d2d9121d571860d (diff) | |
| parent | 1e8356694522c1eabbdad2e27ac1b6b77828f7ae (diff) | |
Merge branch 'master' into bratseth/node-metrics
Diffstat (limited to 'config-provisioning')
3 files changed, 11 insertions, 4 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 92432d1cab4..9a091f1161c 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -507,7 +507,7 @@ ], "methods": [ "public abstract java.util.Optional getDeployment(com.yahoo.config.provision.ApplicationId)", - "public abstract java.util.Map getSupportedInfraDeployments()" + "public abstract void activateAllSupportedInfraApplications(boolean)" ], "fields": [] }, diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java index 6fbabfd0c95..363732ee8a7 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/InfraDeployer.java @@ -1,7 +1,6 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.provision; -import java.util.Map; import java.util.Optional; /** @@ -17,6 +16,6 @@ public interface InfraDeployer { */ Optional<Deployment> getDeployment(ApplicationId application); - /** Returns deployments by application id for the supported infrastructure applications in this zone */ - Map<ApplicationId, Deployment> getSupportedInfraDeployments(); + /** Deploys all supported infrastructure applications in this zone. */ + void activateAllSupportedInfraApplications(boolean propagateException); } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java index 892ac639198..02da2ab98e2 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/RoutingMethod.java @@ -14,4 +14,12 @@ public enum RoutingMethod { /** Routing happens through a dedicated layer 4 load balancer */ exclusive, + /** Routing happens through a shared layer 4 load balancer */ + sharedLayer4; + + /** Returns whether this method routes requests directly to the Vespa container cluster */ + public boolean isDirect() { + return this == exclusive || this == sharedLayer4; + } + } |