Merge pull request #21739 from vespa-engine/hmusum/specify-architecture-for-default-node-resources-for-admin-cluster

Specify architecture for default node resources for admin clusters

1 files changed, 6 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 290a3f8f947..45e9efc1a1d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -13,6 +13,8 @@ import com.yahoo.vespa.hosted.provision.NodeRepository;
 
 import java.util.function.Function;
 
+import static com.yahoo.config.provision.NodeResources.Architecture;
+
 /**
  * Defines the policies for assigning cluster capacity in various environments
  *
@@ -23,10 +25,12 @@ public class CapacityPolicies {
 
     private final Zone zone;
     private final Function<ClusterSpec.Type, Boolean> sharedHosts;
+    private final Architecture architectureForAdminCluster;
 
     public CapacityPolicies(NodeRepository nodeRepository) {
         this.zone = nodeRepository.zone();
         this.sharedHosts = type -> PermanentFlags.SHARED_HOST.bindTo(nodeRepository.flagSource()).value().isEnabled(type.name());
+        this.architectureForAdminCluster = Architecture.valueOf(PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE.bindTo(nodeRepository.flagSource()).value());
     }
 
     public Capacity applyOn(Capacity capacity, ApplicationId application) {
@@ -72,8 +76,8 @@ public class CapacityPolicies {
     public NodeResources defaultNodeResources(ClusterSpec.Type clusterType) {
         if (clusterType == ClusterSpec.Type.admin) {
             return zone.getCloud().dynamicProvisioning() && ! sharedHosts.apply(clusterType) ?
-                   new NodeResources(0.5, 4, 50, 0.3) :
-                   new NodeResources(0.5, 2, 50, 0.3);
+                    new NodeResources(0.5, 4, 50, 0.3).with(architectureForAdminCluster) :
+                    new NodeResources(0.5, 2, 50, 0.3).with(architectureForAdminCluster);
         }
 
         return zone.getCloud().dynamicProvisioning() ?