tweaks to deploy release

AztecProtocol · Nov 21, 2024 · 7394740 · 7394740
1 parent 526a857
commit 7394740
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
@@ -158,6 +158,8 @@ spec:
               value: {{ include "aztec-network.otelCollectorLogsEndpoint" . | quote }}
             - name: PROVER_REAL_PROOFS
               value: "{{ .Values.bootNode.realProofs }}"
+            - name: PXE_PROVER_ENABLED
+              value: "{{ .Values.bootNode.realProofs }}"
             - name: ETHEREUM_SLOT_DURATION
               value: "{{ .Values.ethereum.blockTime }}"
             - name: AZTEC_SLOT_DURATION

diff --git a/spartan/aztec-network/templates/deploy-l1-verifier.yaml b/spartan/aztec-network/templates/deploy-l1-verifier.yaml
@@ -13,6 +13,7 @@ spec:
         app: deploy-l1-verifier
     spec:
       restartPolicy: OnFailure
+      serviceAccountName: {{ include "aztec-network.fullname" . }}-node
       volumes:
         - name: config
           emptyDir: {}

diff --git a/spartan/aztec-network/templates/prover-agent.yaml b/spartan/aztec-network/templates/prover-agent.yaml
@@ -18,11 +18,20 @@ spec:
         app: prover-agent
     spec:
       serviceAccountName: {{ include "aztec-network.fullname" . }}-node
-      {{- if .Values.proverAgent.nodeSelector }}
-      nodeSelector:
-        {{- toYaml .Values.proverAgent.nodeSelector | nindent 8 }}
+      {{- if .Values.proverAgent.gke.spotEnabled }}
+      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"
       {{- end }}
-
       {{- if .Values.network.public }}
       hostNetwork: true
       {{- end }}

diff --git a/spartan/aztec-network/values/release.yaml b/spartan/aztec-network/values/release.yaml
@@ -10,18 +10,16 @@ telemetry:
   otelCollectorEndpoint: http://34.150.160.154:4318
 
 validator:
-  replicas: 4
+  replicas: 3
   realProofs: true
   validatorKeys:
     - 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
     - 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
     - 0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a
-    - 0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6
   validatorAddresses:
     - 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
     - 0x70997970C51812dc3A010C7d01b50e0d17dc79C8
     - 0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
-    - 0x90F79bf6EB2c4f870365E785982E1f101E93b906
 
   resources:
     requests:
@@ -42,6 +40,8 @@ proverAgent:
   realProofs: true
   bb:
     hardwareConcurrency: 16
+  gke:
+    spotEnabled: true
   resources:
     requests:
       memory: "64Gi"

diff --git a/spartan/terraform/deploy-release/release.tfvars b/spartan/terraform/deploy-release/release.tfvars
@@ -1,4 +1,4 @@
 release_name       = "rough-rhino"
 values_file        = "release.yaml"
-aztec_docker_image = "iamjustmitch/aztec:701380ba5e48bfc286adb13a875e890754c4db32"
+aztec_docker_image = "aztecprotocol/aztec:698cd3d62680629a3f1bfc0f82604534cedbccf3-x86_64"