From 2d1bf0d4fb7f8c78c5eb796dd44be7ee2c08c581 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Fri, 20 Mar 2020 13:26:16 +0100 Subject: Use builder --- .../vespa/model/container/xml/ContainerModelBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config-model') 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 73f4804ad18..1b2df3d47e3 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 @@ -653,7 +653,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder { DeployState deployState = context.getDeployState(); HostSystem hostSystem = cluster.hostSystem(); if (deployState.isHosted()) { - // TODO(mpolden): The old way of allocating. Remove when 7.198 is the oldest model in production + // TODO(mpolden): The old way of allocating. Remove when 7.198 is the oldest model in production and the + // feature flag is set to true in all zones. if (!context.properties().useDedicatedNodesWhenUnspecified()) { Optional singleContentHost = getHostResourceFromContentClusters(cluster, containerElement, context); if (singleContentHost.isPresent()) { // there is a content cluster; put the container on its first node @@ -674,11 +675,10 @@ public class ContainerModelBuilder extends ConfigModelBuilder { } // request just enough nodes to satisfy environment capacity requirement ClusterSpec clusterSpec = ClusterSpec.request(ClusterSpec.Type.container, - ClusterSpec.Id.from(cluster.getName()), - deployState.getWantedNodeVespaVersion(), - false, - Optional.empty(), - deployState.getWantedDockerImageRepo()); + ClusterSpec.Id.from(cluster.getName())) + .vespaVersion(deployState.getWantedNodeVespaVersion()) + .dockerImageRepo(deployState.getWantedDockerImageRepo()) + .build(); int nodeCount = deployState.zone().environment().isProduction() ? 2 : 1; Capacity capacity = Capacity.fromCount(nodeCount, Optional.empty(), -- cgit v1.2.3