diff options
Diffstat (limited to 'configserver/src/main')
3 files changed, 3 insertions, 68 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java deleted file mode 100644 index 07e57270dbd..00000000000 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.server.model; - -import com.yahoo.cloud.config.RoutingConfig; -import com.yahoo.config.model.api.ApplicationInfo; -import com.yahoo.config.model.api.HostInfo; -import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.ApplicationName; -import com.yahoo.config.provision.TenantName; -import com.yahoo.vespa.config.server.tenant.TenantRepository; - -import java.util.Map; -import java.util.Set; - -/** - * Create global config based on info from the zone application - * - * @author Christian Andersen - */ -// TODO Delete once YCA filter is removed -@Deprecated(forRemoval = true) -public class RoutingProducer implements RoutingConfig.Producer { - - static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing"); - - private final Map<TenantName, Set<ApplicationInfo>> models; - - public RoutingProducer(Map<TenantName, Set<ApplicationInfo>> models) { - this.models = models; - } - - @Override - public void getConfig(RoutingConfig.Builder builder) { - for (Set<ApplicationInfo> model : models.values()) { - model.stream() - .filter(application -> isHostedVespaRoutingApplication(application.getApplicationId())) - .forEach(application -> { - for (HostInfo host : application.getModel().getHosts()) { - builder.hosts(host.getHostname()); - } - }); - } - } - - private boolean isHostedVespaRoutingApplication(ApplicationId applicationId) { - return TenantRepository.HOSTED_VESPA_TENANT.equals(applicationId.tenant()) && - (ROUTING_APPLICATION.equals(applicationId.application())); - } - -} diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java index 9631713c870..c51690cd3a8 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.config.server.model; import com.yahoo.cloud.config.LbServicesConfig; -import com.yahoo.cloud.config.RoutingConfig; import com.yahoo.config.ConfigInstance; import com.yahoo.config.ConfigurationRuntimeException; import com.yahoo.config.model.api.ApplicationInfo; @@ -21,17 +20,14 @@ import java.util.Map; * * @author Vegard Havdal */ -public class SuperModelConfigProvider implements LbServicesConfig.Producer, RoutingConfig.Producer { +public class SuperModelConfigProvider implements LbServicesConfig.Producer { private final SuperModel superModel; private final LbServicesProducer lbProd; - @SuppressWarnings("removal") private final RoutingProducer zoneProd; - @SuppressWarnings("removal") // For RoutingProducer public SuperModelConfigProvider(SuperModel superModel, Zone zone, FlagSource flagSource) { this.superModel = superModel; this.lbProd = new LbServicesProducer(Collections.unmodifiableMap(superModel.getModelsPerTenant()), zone, flagSource); - this.zoneProd = new RoutingProducer(Collections.unmodifiableMap(superModel.getModelsPerTenant())); } public SuperModel getSuperModel() { @@ -44,10 +40,6 @@ public class SuperModelConfigProvider implements LbServicesConfig.Producer, Rout LbServicesConfig.Builder builder = new LbServicesConfig.Builder(); getConfig(builder); return ConfigPayload.fromInstance(new LbServicesConfig(builder)); - } else if (configKey.equals(new ConfigKey<>(RoutingConfig.class, configKey.getConfigId()))) { - RoutingConfig.Builder builder = new RoutingConfig.Builder(); - getConfig(builder); - return ConfigPayload.fromInstance(new RoutingConfig(builder)); } else { throw new ConfigurationRuntimeException(configKey + " is not valid when asking for config from SuperModel"); } @@ -59,12 +51,7 @@ public class SuperModelConfigProvider implements LbServicesConfig.Producer, Rout public void getConfig(LbServicesConfig.Builder builder) { lbProd.getConfig(builder); } - - @Override - public void getConfig(RoutingConfig.Builder builder) { - zoneProd.getConfig(builder); - } - + public <CONFIGTYPE extends ConfigInstance> CONFIGTYPE getConfig(Class<CONFIGTYPE> configClass, ApplicationId applicationId, String configId) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/GlobalConfigAuthorizationPolicy.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/GlobalConfigAuthorizationPolicy.java index cc1125b6cc6..e0e74b93ccf 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/GlobalConfigAuthorizationPolicy.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/GlobalConfigAuthorizationPolicy.java @@ -2,7 +2,6 @@ package com.yahoo.vespa.config.server.rpc.security; import com.yahoo.cloud.config.LbServicesConfig; -import com.yahoo.cloud.config.RoutingConfig; import com.yahoo.config.ConfigInstance; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.config.ConfigKey; @@ -18,8 +17,7 @@ import java.util.List; */ enum GlobalConfigAuthorizationPolicy { - LB_SERVICES(new LbServicesConfig.Builder(), NodeType.proxy), - ROUTING(new RoutingConfig.Builder(), NodeType.tenant); // TODO Remove handling of RoutingConfig when YCA filter is removed + LB_SERVICES(new LbServicesConfig.Builder(), NodeType.proxy); final String namespace; final String name; |