diff options
| author | Morten Tokle <mortent@yahooinc.com> | 2023-09-20 12:48:39 +0200 |
|---|---|---|
| committer | Morten Tokle <mortent@yahooinc.com> | 2023-09-20 12:48:39 +0200 |
| commit | aa79b710c0a140303c0ff6c445f96883171b8df9 (patch) | |
| tree | 7a45b6ce16e74cca48c77308d759d71c08e4f360 /config-model/src/main/java/com | |
| parent | 16a4153953248160093cecedfd0a97777de480e3 (diff) | |
Set up dataplane proxy when token endpoints defined
Diffstat (limited to 'config-model/src/main/java/com')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java | 6 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 4 |
2 files changed, 1 insertions, 9 deletions
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 da81f7a90f2..815c32e3c8f 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 @@ -85,7 +85,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private Optional<CloudAccount> cloudAccount = Optional.empty(); private boolean allowUserFilters = true; private List<DataplaneToken> dataplaneTokens; - private boolean enableDataplaneProxy; private int contentLayerMetadataFeatureLevel = 0; @Override public ModelContext.FeatureFlags featureFlags() { return this; } @@ -375,11 +374,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea return this; } - public TestProperties setEnableDataplaneProxy(boolean enable) { - this.enableDataplaneProxy = enable; - return this; - } - public TestProperties setContentLayerMetadataFeatureLevel(int level) { this.contentLayerMetadataFeatureLevel = level; return this; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index d0d039a9dcb..35b0213bf59 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -1460,8 +1460,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { private static boolean enableTokenSupport(DeployState state, ApplicationContainerCluster cluster) { Set<ContainerEndpoint> tokenEndpoints = tokenEndpoints(state); - return state.isHosted() && state.zone().system().isPublic() - && cluster.getClients().stream().anyMatch(c -> !c.tokens().isEmpty()) - && ! tokenEndpoints.isEmpty(); + return state.isHosted() && state.zone().system().isPublic() && ! tokenEndpoints.isEmpty(); } } |