Merge pull request #27146 from vespa-engine/jonmv/store-endpoint-settings-also-without-nodes-tag

Store endpoint settings also when parsing container without nodes

1 files changed, 3 insertions, 1 deletions

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 3cb0731c43a..e1d222e0546 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
@@ -932,9 +932,11 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             int nodeCount = deployState.zone().environment().isProduction() ? 2 : 1;
             deployState.getDeployLogger().logApplicationPackage(Level.INFO, "Using " + nodeCount + " nodes in " + cluster);
             var nodesSpec = NodesSpecification.dedicated(nodeCount, context);
+            ClusterSpec.Id clusterId = ClusterSpec.Id.from(cluster.getName());
             var hosts = nodesSpec.provision(hostSystem,
                                             ClusterSpec.Type.container,
-                                            ClusterSpec.Id.from(cluster.getName()),
+                                            clusterId,
+                                            zoneEndpoint(context, clusterId),
                                             deployState.getDeployLogger(),
                                             false,
                                             context.clusterInfo().build());