diff options
10 files changed, 1 insertions, 74 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java index 4edf3c455d0..0bffdc9b735 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/HostProvisioner.java @@ -18,9 +18,6 @@ public interface HostProvisioner { // TODO: Remove HostSpec allocateHost(String alias); - @Deprecated // TODO: Remove after April 2020 - List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger); - /** * Prepares allocation of a set of hosts with a given type, common id and the amount. * diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index afa4000f891..394018e45db 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -35,10 +35,6 @@ public interface ModelContext { Properties properties(); default Optional<File> appDir() { return Optional.empty();} - // TODO: Remove when 7.211 is oldest model version in use - /** The Docker image repo we want to use for images for this deployment (optional, will use default if empty) */ - default Optional<String> wantedDockerImageRepository() { return Optional.empty(); } - /** The Docker image repo we want to use for images for this deployment (optional, will use default if empty) */ default Optional<DockerImage> wantedDockerImageRepo() { return Optional.empty(); } @@ -68,9 +64,6 @@ public interface ModelContext { // TODO Revisit in May or June 2020 boolean useAdaptiveDispatch(); - // TODO: Remove after April 2020 - default Optional<TlsSecrets> tlsSecrets() { return Optional.empty(); } - default Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return Optional.empty(); } // TODO Revisit in May or June 2020 @@ -92,14 +85,6 @@ public interface ModelContext { boolean useThreePhaseUpdates(); - // TODO: Remove once there are no Vespa versions below 7.170 - boolean useBucketSpaceMetric(); - - default boolean useNewAthenzFilter() { return true; } // TODO bjorncs: Remove after end of April - - // TODO: Remove after April 2020 - default boolean usePhraseSegmenting() { return false; } - default String proxyProtocol() { return "https+proxy-protocol"; } // TODO bjorncs: Remove after end of May default Optional<AthenzDomain> athenzDomain() { return Optional.empty(); } diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index 24cf892c49a..55c3f98f0f3 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -6,7 +6,6 @@ import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.api.ContainerEndpoint; import com.yahoo.config.model.api.EndpointCertificateSecrets; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.config.model.api.TlsSecrets; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.HostName; @@ -65,7 +64,6 @@ public class TestProperties implements ModelContext.Properties { @Override public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; } @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; } - @Override public Optional<TlsSecrets> tlsSecrets() { return endpointCertificateSecrets.map(TlsSecrets::new); } @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } @Override @@ -86,7 +84,6 @@ public class TestProperties implements ModelContext.Properties { @Override public double defaultTopKProbability() { return topKProbability; } @Override public boolean useDistributorBtreeDb() { return useDistributorBtreeDb; } @Override public boolean useThreePhaseUpdates() { return useThreePhaseUpdates; } - @Override public boolean useBucketSpaceMetric() { return true; } @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); } public TestProperties setDefaultTermwiseLimit(double limit) { diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java index 201b69c1aae..e55686accca 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java @@ -45,12 +45,6 @@ public class HostsXmlProvisioner implements HostProvisioner { } @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity quantity, int groups, ProvisionLogger logger) { - throw new UnsupportedOperationException("Prepare on an XML host provisioner is not supported"); - } - - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity quantity, ProvisionLogger logger) { throw new UnsupportedOperationException("Prepare on an XML host provisioner is not supported"); } diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java index 8706bb44ded..1a1ed000478 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java @@ -123,12 +123,6 @@ public class InMemoryProvisioner implements HostProvisioner { } @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity requestedCapacity, int groups, ProvisionLogger logger) { - return prepare(cluster, requestedCapacity.withGroups(groups), logger); - } - - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity requested, ProvisionLogger logger) { provisioned.add(cluster.id(), requested); if (useMaxResources) diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java index 8945223447f..1f0e0755667 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/SingleNodeProvisioner.java @@ -42,12 +42,6 @@ public class SingleNodeProvisioner implements HostProvisioner { } @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) { - return prepare(cluster, capacity.withGroups(groups), logger); - } - - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) { // TODO: This should fail if capacity requested is more than 1 List<HostSpec> hosts = new ArrayList<>(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java index cf1ae637cf9..ac77b821d4a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/VespaModelFactoryTest.java @@ -109,12 +109,6 @@ public class VespaModelFactoryTest { } @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) { - return prepare(cluster, capacity.withGroups(groups), logger); - } - - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) { return List.of(new HostSpec(hostName, List.of(), diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 61ecfa16f66..dfc71c7fd9f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -8,12 +8,11 @@ import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.api.ContainerEndpoint; +import com.yahoo.config.model.api.EndpointCertificateSecrets; import com.yahoo.config.model.api.HostProvisioner; import com.yahoo.config.model.api.Model; import com.yahoo.config.model.api.ModelContext; -import com.yahoo.config.model.api.EndpointCertificateSecrets; import com.yahoo.config.model.api.Provisioned; -import com.yahoo.config.model.api.TlsSecrets; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.AthenzDomain; import com.yahoo.config.provision.DockerImage; @@ -125,9 +124,6 @@ public class ModelContextImpl implements ModelContext { public Optional<File> appDir() { return appDir; } @Override - public Optional<String> wantedDockerImageRepository() { return wantedDockerImageRepository.map(DockerImage::repository); } - - @Override public Optional<DockerImage> wantedDockerImageRepo() { return wantedDockerImageRepository; } @Override @@ -246,9 +242,6 @@ public class ModelContextImpl implements ModelContext { public boolean useAdaptiveDispatch() { return useAdaptiveDispatch; } @Override - public Optional<TlsSecrets> tlsSecrets() { return endpointCertificateSecrets.map(TlsSecrets::new); } - - @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; } @Override @@ -283,13 +276,6 @@ public class ModelContextImpl implements ModelContext { return useThreePhaseUpdates; } - // TODO: Remove - @Override - public boolean useBucketSpaceMetric() { return true; } - - @Override - public boolean useNewAthenzFilter() { return true; } - @Override public Optional<AthenzDomain> athenzDomain() { return athenzDomain; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java index 7ce255910e6..307ec5c0c3c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/ProvisionerAdapter.java @@ -39,13 +39,6 @@ public class ProvisionerAdapter implements HostProvisioner { } @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) { - provisioned.add(cluster.id(), capacity); - return provisioner.prepare(applicationId, cluster, capacity.withGroups(groups), logger); - } - - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) { provisioned.add(cluster.id(), capacity); return provisioner.prepare(applicationId, cluster, capacity, logger); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java index 8ddfb1e8b09..fff129b04e4 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/provision/StaticProvisioner.java @@ -33,13 +33,6 @@ public class StaticProvisioner implements HostProvisioner { throw new UnsupportedOperationException("Allocating a single host from provisioning info is not supported"); } - - @Override - @Deprecated // TODO: Remove after April 2020 - public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) { - return prepare(cluster, capacity.withGroups(groups), logger); - } - @Override public List<HostSpec> prepare(ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) { List<HostSpec> hostsAlreadyAllocatedToCluster = |