From b3c12453d3bf6db456bf46077d4468da71f60cd5 Mon Sep 17 00:00:00 2001
From: Alex Gherghisan <alexghr@users.noreply.github.com>
Date: Wed, 3 Jun 2026 15:22:39 +0000
Subject: [PATCH 1/2] chore: aztec-node render external secrets

---
 spartan/aztec-node/templates/_pod-template.yaml | 14 ++++++++++++++
 spartan/aztec-node/templates/extra-objects.yaml |  4 ++++
 spartan/aztec-node/values.yaml                  |  5 +++++
 3 files changed, 23 insertions(+)
 create mode 100644 spartan/aztec-node/templates/extra-objects.yaml

diff --git a/spartan/aztec-node/templates/_pod-template.yaml b/spartan/aztec-node/templates/_pod-template.yaml
index 7c6bf0bbcf60..0b43402800aa 100644
--- a/spartan/aztec-node/templates/_pod-template.yaml
+++ b/spartan/aztec-node/templates/_pod-template.yaml
@@ -145,6 +145,20 @@ spec:
         - secretRef:
             name: {{ include "chart.fullname" . }}-env
         {{- end }}
+        {{- range .Values.node.envFrom.configMaps }}
+        - configMapRef:
+            name: {{ tpl .name $ | quote }}
+            {{- if hasKey . "optional" }}
+            optional: {{ .optional }}
+            {{- end }}
+        {{- end }}
+        {{- range .Values.node.envFrom.secrets }}
+        - secretRef:
+            name: {{ tpl .name $ | quote }}
+            {{- if hasKey . "optional" }}
+            optional: {{ .optional }}
+            {{- end }}
+        {{- end }}
       env:
         - name: POD_IP
           valueFrom:
diff --git a/spartan/aztec-node/templates/extra-objects.yaml b/spartan/aztec-node/templates/extra-objects.yaml
new file mode 100644
index 000000000000..b058f886db65
--- /dev/null
+++ b/spartan/aztec-node/templates/extra-objects.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ tpl (toYaml .) $ }}
+{{- end }}
diff --git a/spartan/aztec-node/values.yaml b/spartan/aztec-node/values.yaml
index c5a0ed7ce1b8..43bd3c883a26 100644
--- a/spartan/aztec-node/values.yaml
+++ b/spartan/aztec-node/values.yaml
@@ -88,6 +88,8 @@ node:
   envFrom:
     configMapEnabled: false
     secretEnabled: false
+    configMaps: []
+    secrets: []
 
   configMap:
     envEnabled: false
@@ -251,3 +253,6 @@ serviceAccount:
   name: ""
   # -- Annotations for the service account
   annotations: {}
+
+# -- Additional Kubernetes objects to render with this chart.
+extraObjects: []

From e7889632cdd5edbcd462469dc5228ee73024bc9a Mon Sep 17 00:00:00 2001
From: Alex Gherghisan <alexghr@users.noreply.github.com>
Date: Tue, 9 Jun 2026 09:07:54 +0000
Subject: [PATCH 2/2] chore: expose ROLLUP_VERSION

---
 spartan/aztec-bot/values.yaml                           | 3 ++-
 spartan/aztec-node/templates/_pod-template.yaml         | 2 +-
 spartan/aztec-node/values.yaml                          | 4 ++--
 spartan/aztec-prover-stack/values.yaml                  | 3 ++-
 spartan/aztec-validator/values.yaml                     | 3 ++-
 spartan/terraform/deploy-aztec-infra/values/common.yaml | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/spartan/aztec-bot/values.yaml b/spartan/aztec-bot/values.yaml
index b44630c0a1c9..2161b124ba76 100644
--- a/spartan/aztec-bot/values.yaml
+++ b/spartan/aztec-bot/values.yaml
@@ -1,5 +1,6 @@
 global:
-  aztecRollupVersion: "canonical"
+  aztecEnv:
+    ROLLUP_VERSION: "canonical"
   aztecNetwork: ""
   customAztecNetwork:
     enabled: false
diff --git a/spartan/aztec-node/templates/_pod-template.yaml b/spartan/aztec-node/templates/_pod-template.yaml
index 0b43402800aa..1cd1228e2aa8 100644
--- a/spartan/aztec-node/templates/_pod-template.yaml
+++ b/spartan/aztec-node/templates/_pod-template.yaml
@@ -339,7 +339,7 @@ spec:
         - name: PROVER_ID
           value: {{ .Values.node.coinbase | quote }}
         {{- end }}
-        {{- range $key, $value := .Values.node.env }}
+        {{- range $key, $value := mergeOverwrite (dict) .Values.global.aztecEnv .Values.node.env }}
         - name: {{ $key }}
           value: {{ $value | quote }}
         {{- end }}
diff --git a/spartan/aztec-node/values.yaml b/spartan/aztec-node/values.yaml
index 43bd3c883a26..f053da91ca8e 100644
--- a/spartan/aztec-node/values.yaml
+++ b/spartan/aztec-node/values.yaml
@@ -11,8 +11,8 @@ podManagementPolicy: Parallel
 
 # global config for all Aztec nodes in an instalation
 global:
-  # Which rollup contract we want to follow from the registry
-  aztecRollupVersion: "canonical"
+  # -- Environment variables shared by all Aztec nodes. Overridden by node.env.
+  aztecEnv: {}
   # -- Network name - this is a predefined network - alpha-testnet, devnet
   aztecNetwork: ""
   # -- Custom network - (not recommended) - Only for custom testnet usecases, (must have deployed your own protocol contracts first)
diff --git a/spartan/aztec-prover-stack/values.yaml b/spartan/aztec-prover-stack/values.yaml
index ae014973bcd7..17631052e3a8 100644
--- a/spartan/aztec-prover-stack/values.yaml
+++ b/spartan/aztec-prover-stack/values.yaml
@@ -1,5 +1,6 @@
 global:
-  aztecRollupVersion: "canonical"
+  aztecEnv:
+    ROLLUP_VERSION: "canonical"
   aztecNetwork: ""
   customAztecNetwork:
     enabled: false
diff --git a/spartan/aztec-validator/values.yaml b/spartan/aztec-validator/values.yaml
index 46fa3ce2d784..40e1b2d04023 100644
--- a/spartan/aztec-validator/values.yaml
+++ b/spartan/aztec-validator/values.yaml
@@ -1,5 +1,6 @@
 global:
-  aztecRollupVersion: "canonical"
+  aztecEnv:
+    ROLLUP_VERSION: "canonical"
   aztecNetwork: ""
   customAztecNetwork:
     enabled: false
diff --git a/spartan/terraform/deploy-aztec-infra/values/common.yaml b/spartan/terraform/deploy-aztec-infra/values/common.yaml
index 7c85c7d8ca2d..d74dd555fce1 100644
--- a/spartan/terraform/deploy-aztec-infra/values/common.yaml
+++ b/spartan/terraform/deploy-aztec-infra/values/common.yaml
@@ -1,2 +1,3 @@
 global:
-  aztecRollupVersion: "canonical"
+  aztecEnv:
+    ROLLUP_VERSION: "canonical"