Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Service Address Setup Container
- name: OTEL_COLLECTOR_ENDPOINT
value: "{{ .Values.telemetry.otelCollectorEndpoint }}"
- name: EXTERNAL_ETHEREUM_HOST
value: "{{ .Values.ethereum.externalHost }}"
value: "{{ .Values.ethereum.execution.externalHost }}"
- name: ETHEREUM_PORT
value: "{{ .Values.ethereum.execution.service.port }}"
- name: EXTERNAL_ETHEREUM_CONSENSUS_HOST
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/eth/eth-beacon.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if not .Values.ethereum.externalHost }}
{{- if not .Values.ethereum.beacon.externalHost }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/eth/eth-execution.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if not .Values.ethereum.externalHost }}
{{- if not .Values.ethereum.execution.externalHost }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/eth/eth-validator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if not .Values.ethereum.externalHost }}
{{- if not .Values.ethereum.beacon.externalHost }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/faucet.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if and (not .Values.ethereum.externalHost) .Values.pxe.enabled }}
{{- if and (not .Values.ethereum.execution.externalHost) .Values.pxe.enabled }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ ethereum:
# 10 times the default of 131072
maxTxInputSizeBytes: "1310720"
args: ""
externalHost: ""
execution:
externalHost: ""
service:
port: 8545
targetPort: 8545
Expand Down
3 changes: 2 additions & 1 deletion spartan/aztec-network/values/rc-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ network:
ethereum:
chainId: "11155111"
deployL1ContractsPrivateKey:
externalHost:
execution:
externalHost:
beacon:
externalHost:
apiKey: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ network:
ethereum:
chainId: "11155111"
deployL1ContractsPrivateKey:
externalHost:
execution:
externalHost:
beacon:
externalHost:

validator:
l1FixedPriorityFeePerGas: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ network:
ethereum:
chainId: "11155111"
deployL1ContractsPrivateKey:
externalHost:
execution:
externalHost:
beacon:
externalHost:
apiKey: ""
Expand Down
2 changes: 1 addition & 1 deletion spartan/terraform/deploy-release/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ resource "helm_release" "aztec-gke-cluster" {
dynamic "set" {
for_each = var.EXTERNAL_ETHEREUM_HOST != "" ? toset(["iterate"]) : toset([])
content {
name = "ethereum.externalHost"
name = "ethereum.execution.externalHost"
value = var.EXTERNAL_ETHEREUM_HOST
}
}
Expand Down
2 changes: 1 addition & 1 deletion spartan/terraform/multicloud-deploy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ resource "helm_release" "aztec-gke-cluster" {

# pointing Google Cloud provers to nodes in AWS
set {
name = "ethereum.externalHost"
name = "ethereum.execution.externalHost"
value = data.kubernetes_service.lb_ethereum_tcp.status.0.load_balancer.0.ingress.0.hostname
}

Expand Down