summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-11-26 14:44:14 +0100
committerMorten Tokle <mortent@verizonmedia.com>2021-11-26 14:44:14 +0100
commit59850885588f1f4e75a3eaf115da9a3c0d02c9eb (patch)
treee952f2cdc1c05da3a797e522b5de188236ae847b /configserver
parentf05ef33d3778c05c1ccdef8cd0875a6ae7985519 (diff)
Remove default scope
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
index 3bbf98357f5..121f4397129 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
@@ -36,9 +36,7 @@ public class ContainerEndpointSerializer {
public static ContainerEndpoint endpointFromSlime(Inspector inspector) {
final var clusterId = inspector.field(clusterIdField).asString();
- // Currently assigned endpoints that do not have scope should be interpreted as global endpoints
- // TODO: Remove default assignment after 7.500
- final var scope = SlimeUtils.optionalString(inspector.field(scopeField)).orElse(ApplicationClusterEndpoint.Scope.global.name());
+ final var scope = inspector.field(scopeField).asString();
final var namesInspector = inspector.field(namesField);
final var weight = SlimeUtils.optionalInteger(inspector.field(weightField));
if (clusterId.isEmpty()) {