chore: update resource profiles

spartan/environments/bench-10tps.env

@@ -1,5 +1,6 @@
 NAMESPACE=${NAMESPACE:-bench-10tps}
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 GCP_REGION=us-west1-a
 DESTROY_NAMESPACE=true
 DESTROY_AZTEC_INFRA=true
@@ -30,7 +31,7 @@ VALIDATOR_REPLICAS=3
 VALIDATORS_PER_NODE=20
 VALIDATOR_PUBLISHERS_PER_REPLICA=4
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
-VALIDATOR_RESOURCE_PROFILE="prod-spot"
+VALIDATOR_RESOURCE_PROFILE="prod"
 VALIDATOR_HA_REPLICAS=1
 
 SEQ_BLOCK_DURATION_MS=6000
@@ -47,11 +48,11 @@ RPC_RESOURCE_PROFILE="prod"
 RPC_INGRESS_ENABLED=false
 
 FULL_NODE_REPLICAS=5
-FULL_NODE_RESOURCE_PROFILE="2-core-spot"
+FULL_NODE_RESOURCE_PROFILE="prod"
 
 REAL_VERIFIER=false
 PROVER_REPLICAS=10
-PROVER_RESOURCE_PROFILE="hi-tps"
+PROVER_RESOURCE_PROFILE="dev-hi-tps"
 PUBLISHERS_PER_PROVER=1
 PROVER_PUBLISHER_MNEMONIC_START_INDEX=8000
 PROVER_AGENT_POLL_INTERVAL_MS=10000

spartan/environments/block-capacity.env

@@ -1,5 +1,6 @@
 NAMESPACE=${NAMESPACE:-block-capacity}
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 GCP_REGION=us-west1-a
 
 AZTEC_EPOCH_DURATION=8
@@ -23,7 +24,7 @@ OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
 VALIDATOR_REPLICAS=1
 VALIDATORS_PER_NODE=48
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
-VALIDATOR_RESOURCE_PROFILE="prod-hi-tps"
+VALIDATOR_RESOURCE_PROFILE="prod"
 
 REAL_VERIFIER=false
 

spartan/environments/devnet.env

@@ -1,5 +1,6 @@
 GCP_REGION=us-west1-a
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=dev
 
 NETWORK="devnet"
 NAMESPACE=${NAMESPACE:-devnet}

spartan/environments/kind-minimal.env

@@ -3,6 +3,7 @@
 
 NAMESPACE=${NAMESPACE:-kind}
 CLUSTER=kind
+RESOURCE_PROFILE=dev
 CREATE_ETH_DEVNET=true
 CREATE_ROLLUP_CONTRACTS=true
 CREATE_AZTEC_INFRA=true

spartan/environments/kind-provers.env

@@ -3,6 +3,7 @@
 
 NAMESPACE=${NAMESPACE:-kind}
 CLUSTER=kind
+RESOURCE_PROFILE=dev
 CREATE_ETH_DEVNET=true
 CREATE_ROLLUP_CONTRACTS=true
 CREATE_AZTEC_INFRA=true

spartan/environments/mainnet.env

@@ -4,6 +4,7 @@ ETHEREUM_CHAIN_ID=${ETHEREUM_CHAIN_ID:-1}
 
 GCP_REGION=us-west1-a
 CLUSTER=aztec-gke-public
+RESOURCE_PROFILE=prod
 NAMESPACE=${NAMESPACE:-mainnet}
 
 CREATE_ROLLUP_CONTRACTS=false
@@ -24,9 +25,9 @@ FISHERMAN_REPLICAS=1
 FISHERMAN_MNEMONIC_START_INDEX=1
 PROVER_NODE_DISABLE_PROOF_PUBLISH=true
 
-RPC_RESOURCE_PROFILE=mainnet
-BLOB_SINK_RESOURCE_PROFILE=mainnet
-PROVER_RESOURCE_PROFILE=mainnet
+RPC_RESOURCE_PROFILE=prod
+BLOB_SINK_RESOURCE_PROFILE=prod
+PROVER_RESOURCE_PROFILE=prod
 
 LOG_LEVEL=info
 FISHERMAN_LOG_LEVEL=info

spartan/environments/next-net.env

@@ -1,6 +1,7 @@
 CREATE_ETH_DEVNET=false
 GCP_REGION=us-west1-a
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 NETWORK=next-net
 NAMESPACE=${NAMESPACE:-next-net}
 DESTROY_NAMESPACE=true
@@ -69,7 +70,7 @@ RPC_INGRESS_STATIC_IP_NAME=nextnet-rpc-ip
 RPC_INGRESS_SSL_CERT_NAMES='["nextnet-rpc-cert"]'
 
 VALIDATOR_HA_REPLICAS=1
-VALIDATOR_RESOURCE_PROFILE="prod-spot"
+VALIDATOR_RESOURCE_PROFILE="prod"
 
 REAL_VERIFIER=true
 AZTEC_SLOT_DURATION=72

spartan/environments/next-scenario.env

@@ -1,5 +1,6 @@
 NAMESPACE=${NAMESPACE:-scenario}
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 GCP_REGION=us-west1-a
 DESTROY_NAMESPACE=true
 DESTROY_ETH_DEVNET=true
@@ -52,4 +53,4 @@ PROVER_L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE=0
 SEQ_MIN_TX_PER_BLOCK=0
 
 VALIDATOR_HA_REPLICAS=1
-VALIDATOR_RESOURCE_PROFILE="prod-spot"
+VALIDATOR_RESOURCE_PROFILE="prod"

spartan/environments/prove-n-tps-fake.env

@@ -1,5 +1,6 @@
 NAMESPACE=${NAMESPACE:-prove-n-tps-fake}
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 GCP_REGION=us-west1-a
 
 AZTEC_EPOCH_DURATION=32
@@ -32,7 +33,7 @@ RPC_REPLICAS=1
 RPC_INGRESS_ENABLED=false
 
 PROVER_REPLICAS=10
-PROVER_RESOURCE_PROFILE="hi-tps"
+PROVER_RESOURCE_PROFILE="dev-hi-tps"
 PROVER_PUBLISHER_MNEMONIC_START_INDEX=8000
 PROVER_AGENT_POLL_INTERVAL_MS=10000
 PUBLISHERS_PER_PROVER=1

spartan/environments/prove-n-tps-real.env

@@ -1,5 +1,6 @@
 NAMESPACE=${NAMESPACE:-prove-n-tps-real}
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 GCP_REGION=us-west1-a
 
 AZTEC_EPOCH_DURATION=32

spartan/environments/scenario.local.env

@@ -1,5 +1,6 @@
 NAMESPACE=${NAMESPACE:-scenario}
 CLUSTER=kind
+RESOURCE_PROFILE=dev
 CREATE_ETH_DEVNET=true
 LABS_INFRA_MNEMONIC="test test test test test test test test test test test junk"
 L1_ACCOUNT_MNEMONIC="test test test test test test test test test test test junk"

spartan/environments/staging-public.env

@@ -1,6 +1,7 @@
 CREATE_ETH_DEVNET=false
 GCP_REGION=us-west1-a
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 NETWORK=staging-public
 NAMESPACE=${NAMESPACE:-staging-public}
 ETHEREUM_CHAIN_ID=11155111
@@ -51,7 +52,7 @@ VALIDATOR_PUBLISHERS_PER_REPLICA=4
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
 VALIDATOR_HA_REPLICAS=1
 VALIDATOR_HA_REPLICA_COUNT=4
-VALIDATOR_RESOURCE_PROFILE="prod-spot"
+VALIDATOR_RESOURCE_PROFILE="prod"
 
 PROVER_FAILED_PROOF_STORE=gs://aztec-develop/staging-public/failed-proofs
 L1_TX_FAILED_STORE=gs://aztec-develop/staging-public/failed-l1-txs

spartan/environments/testnet.env

@@ -1,6 +1,7 @@
 CREATE_ETH_DEVNET=false
 GCP_REGION=us-west1-a
 CLUSTER=aztec-gke-public
+RESOURCE_PROFILE=prod
 NAMESPACE=${NAMESPACE:-testnet}
 NETWORK=testnet
 
@@ -80,7 +81,7 @@ VALIDATORS_PER_NODE=64
 VALIDATOR_PUBLISHERS_PER_REPLICA=8
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
 VALIDATOR_HA_REPLICAS=1
-VALIDATOR_RESOURCE_PROFILE="prod-spot"
+VALIDATOR_RESOURCE_PROFILE="prod"
 
 PUBLISHERS_PER_PROVER=2
 PROVER_PUBLISHER_MNEMONIC_START_INDEX=8000

spartan/environments/tps-scenario.env

@@ -1,5 +1,6 @@
 NAMESPACE=${NAMESPACE:-tps-scenario}
 CLUSTER=aztec-gke-private
+RESOURCE_PROFILE=prod
 GCP_REGION=us-west1-a
 
 AZTEC_EPOCH_DURATION=8
@@ -37,20 +38,20 @@ VALIDATOR_REPLICAS=12
 VALIDATORS_PER_NODE=4
 VALIDATOR_PUBLISHERS_PER_REPLICA=4
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
-VALIDATOR_RESOURCE_PROFILE="2-core-dedicated"
+VALIDATOR_RESOURCE_PROFILE="prod"
 
 REAL_VERIFIER=false
 
 RPC_REPLICAS=10
 RPC_INGRESS_ENABLED=false
 
 FULL_NODE_REPLICAS=500
-FULL_NODE_RESOURCE_PROFILE="2-core-spot"
+FULL_NODE_RESOURCE_PROFILE="prod"
 
 PUBLISHERS_PER_PROVER=2
 PROVER_PUBLISHER_MNEMONIC_START_INDEX=8000
 PROVER_REPLICAS=20
-PROVER_RESOURCE_PROFILE="hi-tps"
+PROVER_RESOURCE_PROFILE="dev-hi-tps"
 PROVER_AGENT_POLL_INTERVAL_MS=10000
 WAIT_FOR_PROVER_DEPLOY=false
 

spartan/scripts/deploy_network.sh

@@ -43,7 +43,7 @@ declare -A STAGE_TIMINGS
 ########################
 NAMESPACE=${NAMESPACE} # required
 CLUSTER=${CLUSTER:-kind}
-RESOURCE_PROFILE=${RESOURCE_PROFILE:-$([[ "${CLUSTER}" == "kind" ]] && echo "dev" || echo "prod")}
+RESOURCE_PROFILE=${RESOURCE_PROFILE:?RESOURCE_PROFILE must be set by the environment}
 BASE_STATE_PATH="${CLUSTER}/${NAMESPACE}"
 
 # Don't try and retrieve contract addresses, instead allow deployed infra to read from network config

spartan/terraform/deploy-aztec-infra/main.tf

@@ -157,11 +157,11 @@ locals {
   validator_base_config = {
     chart   = "aztec-validator"
     timeout = 1800
-    values = [
+    values = concat([
       "common.yaml",
       "validator.yaml",
       "validator-resources-${var.VALIDATOR_RESOURCE_PROFILE}.yaml"
-    ]
+    ], var.VALIDATOR_HA_REPLICAS > 0 ? ["validator-resources-spot.yaml", "validator-resources-ha.yaml"] : [])
     inline_values = [yamlencode({
       validator = {
         service = {
@@ -170,18 +170,6 @@ locals {
         node = {
           logLevel = var.LOG_LEVEL
         }
-        # spread validator pods to different nodes to avoid having two validators with the same attester keys on the same physical node
-        topologySpreadConstraints = [{
-          maxSkew           = 1
-          topologyKey       = "kubernetes.io/hostname"
-          whenUnsatisfiable = "ScheduleAnyway" # soft constraint
-          labelSelector = {
-            matchLabels = {
-              "app.kubernetes.io/component" = "sequencer-node"
-            }
-          }
-          matchLabelKeys = ["apps.kubernetes.io/pod-index"]
-        }]
       }
     })]
     boot_node_host_path  = "validator.node.env.BOOT_NODE_HOST"
@@ -206,10 +194,10 @@ locals {
     "validator.slash.duplicateProposalPenalty"                    = var.SLASH_DUPLICATE_PROPOSAL_PENALTY
     "validator.slash.duplicateAttestationPenalty"                 = var.SLASH_DUPLICATE_ATTESTATION_PENALTY
     "validator.slash.attestDescendantOfInvalidPenalty"            = var.SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY
-    "validator.slash.attestInvalidCheckpointProposalPenalty"       = var.SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY
+    "validator.slash.attestInvalidCheckpointProposalPenalty"      = var.SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY
     "validator.slash.unknownPenalty"                              = var.SLASH_UNKNOWN_PENALTY
     "validator.slash.invalidBlockPenalty"                         = var.SLASH_INVALID_BLOCK_PENALTY
-    "validator.slash.invalidCheckpointProposalPenalty"             = var.SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY
+    "validator.slash.invalidCheckpointProposalPenalty"            = var.SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY
     "validator.slash.offenseExpirationRounds"                     = var.SLASH_OFFENSE_EXPIRATION_ROUNDS
     "validator.slash.maxPayloadSize"                              = var.SLASH_MAX_PAYLOAD_SIZE
     "validator.node.env.TRANSACTIONS_DISABLED"                    = var.TRANSACTIONS_DISABLED

spartan/terraform/deploy-aztec-infra/values/bot-resources-dev.yaml

@@ -1,4 +1,24 @@
 bot:
+  nodeSelector:
+    local-ssd: "false"
+    node-type: "network"
+    cores: "2"
+    pool: "spot"
+
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: cloud.google.com/gke-spot
+                operator: Exists
+
+  tolerations:
+    - key: "cloud.google.com/gke-spot"
+      operator: "Equal"
+      value: "true"
+      effect: "NoSchedule"
+
   node:
     resources:
       requests:
@@ -7,4 +27,3 @@ bot:
       limits:
         cpu: "0.5"
         memory: "2Gi"
-

spartan/terraform/deploy-aztec-infra/values/bot-resources-prod.yaml

@@ -2,7 +2,8 @@ bot:
   nodeSelector:
     local-ssd: "false"
     node-type: "network"
-    cores: "8"
+    cores: "2"
+    pool: "spot"
 
   affinity:
     nodeAffinity:
@@ -21,5 +22,8 @@ bot:
   node:
     resources:
       requests:
-        cpu: "7"
-        memory: "16Gi"
+        cpu: "0.5"
+        memory: "1Gi"
+      limits:
+        cpu: "2"
+        memory: "4Gi"