Skip to content

Commit 8784100

Browse files
PhilWindlePhilWindle
authored
chore: Accumulated backports to v2 (#17710)
This PR accumulates backport commits throughout the day and will be auto-merged overnight. Latest backport: #17665 - chore: deploy sepolia nodes 🤖 This PR is managed automatically by the backport workflow. - #17730 - chore: Alert of flakes in the backport-to-v2-staging branch - #17729 - chore: reduce depth of release-please - #17752 - chore: Lower throughput on public
2 parents 06bf30a + 194567f commit 8784100

6 files changed

Lines changed: 177 additions & 3 deletions

File tree

‎.github/release-please-v2.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
"pull-request-header": "Pending Aztec Packages v2 release",
88
"versioning": "always-bump-patch",
99
"include-component-in-tag": false,
10+
"release-search-depth": 50,
11+
"commit-search-depth": 150,
12+
"sequential-calls": true,
1013
"changelog-sections": [
1114
{ "type": "feat", "section": "Features", "hidden": false },
1215
{ "type": "fix", "section": "Bug Fixes", "hidden": false },

‎ci3/run_test_cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ function flake {
218218
track_test "history_${test_hash}${TARGET_BRANCH:+_$TARGET_BRANCH}" "$line"
219219
track_test "failed_tests_${TARGET_BRANCH:-}" "$line"
220220

221-
# Early out if no token or not in merge queue.
222-
if [ -z "${SLACK_BOT_TOKEN:-}" ] || [ "$is_merge_queue" -eq 0 ]; then
221+
# Early out if no token or not in merge queue (unless on backport-to-v2-staging).
222+
if [ -z "${SLACK_BOT_TOKEN:-}" ] || { [ "$is_merge_queue" -eq 0 ] && [ "$REF_NAME" != "backport-to-v2-staging" ]; }; then
223223
return
224224
fi
225225

‎spartan/environments/staging-ignition.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ BOT_TRANSFERS_REPLICAS=0
2828
BOT_SWAPS_REPLICAS=0
2929
DEPLOY_INTERNAL_BOOTNODE=false
3030
FLUSH_ENTRY_QUEUE=false
31+
32+
CREATE_ROLLUP_CONTRACTS=false

‎spartan/environments/staging-public.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PROVER_FAILED_PROOF_STORE=gs://aztec-develop/staging-public/failed-proofs
2323
TEST_ACCOUNTS=false
2424
SPONSORED_FPC=true
2525
SEQ_MIN_TX_PER_BLOCK=0
26-
SEQ_MAX_TX_PER_BLOCK=8
26+
SEQ_MAX_TX_PER_BLOCK=1
2727

2828
VALIDATOR_REPLICAS=5
2929
VALIDATORS_PER_NODE=16

‎spartan/terraform/deploy-sepolia/main.tf‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
terraform {
2+
backend "gcs" {
3+
bucket = "aztec-terraform"
4+
prefix = "terraform/state/eth/sepolia"
5+
}
6+
required_providers {
7+
helm = {
8+
source = "hashicorp/helm"
9+
version = "~> 3.0.2"
10+
}
11+
kubernetes = {
12+
source = "hashicorp/kubernetes"
13+
version = "~> 2.38.0"
14+
}
15+
}
16+
}
17+
18+
provider "kubernetes" {
19+
alias = "gke-cluster"
20+
config_path = "~/.kube/config"
21+
config_context = var.K8S_CLUSTER_CONTEXT
22+
}
23+
24+
provider "helm" {
25+
alias = "gke-cluster"
26+
kubernetes = {
27+
config_path = "~/.kube/config"
28+
config_context = var.K8S_CLUSTER_CONTEXT
29+
}
30+
}
31+
32+
resource "random_bytes" "jwt" {
33+
length = 32
34+
}
35+
36+
locals {
37+
eth_panda_ops_repo = "https://ethpandaops.github.io/ethereum-helm-charts"
38+
39+
lighthouse_chart_ver = "1.1.7"
40+
lighthouse_image = "sigp/lighthouse:v8.0.0-rc.1" # compatible with Fusaka hardfork
41+
42+
reth_name = "reth" # this the name of the helm installed app
43+
reth_chart_ver = "0.1.6"
44+
reth_image = "ghcr.io/paradigmxyz/reth:v1.8.2"
45+
46+
common = yamlencode({
47+
replicas = 1
48+
# we have to mark it as non-sensitive otherwise we can't run for_each on helm_releases :(
49+
jwt = nonsensitive(random_bytes.jwt.hex)
50+
51+
resources = {
52+
requests = {
53+
cpu = 2
54+
memory = "60Gi"
55+
}
56+
}
57+
58+
persistence = {
59+
enabled = true
60+
size = "2Ti"
61+
storageClassName = "premium-rwo"
62+
}
63+
64+
nodeSelector = {
65+
"node-type" = "infra"
66+
}
67+
})
68+
69+
helm_releases = tomap({
70+
reth = {
71+
name = local.reth_name
72+
chart = "reth"
73+
repository = local.eth_panda_ops_repo
74+
version = local.reth_chart_ver
75+
values = [
76+
local.common,
77+
yamlencode({
78+
image = {
79+
pullPolicy = "Always"
80+
repository = split(":", local.reth_image)[0]
81+
tag = split(":", local.reth_image)[1]
82+
}
83+
p2pNodePort = {
84+
enabled = true
85+
port = 32000
86+
}
87+
extraArgs = [
88+
"--chain=sepolia",
89+
"--full"
90+
]
91+
})
92+
]
93+
}
94+
95+
lighthouse = {
96+
name = "lighthouse"
97+
chart = "lighthouse"
98+
version = local.lighthouse_chart_ver
99+
repository = local.eth_panda_ops_repo
100+
values = [
101+
local.common,
102+
yamlencode({
103+
image = {
104+
pullPolicy = "Always"
105+
repository = split(":", local.lighthouse_image)[0]
106+
tag = split(":", local.lighthouse_image)[1]
107+
}
108+
checkpointSync = {
109+
enabled = true
110+
url = "https://checkpoint-sync.sepolia.ethpandaops.io"
111+
}
112+
p2pNodePort = {
113+
enabled = true
114+
port = 32001
115+
}
116+
extraArgs = [
117+
"--execution-endpoint=http://${local.reth_name}.${var.NAMESPACE}.svc.cluster.local:8551",
118+
"--supernode",
119+
"--network=sepolia"
120+
]
121+
})
122+
]
123+
}
124+
})
125+
}
126+
127+
# Create all helm releases using for_each
128+
resource "helm_release" "releases" {
129+
for_each = { for k, v in local.helm_releases : k => v if v != null }
130+
131+
provider = helm.gke-cluster
132+
namespace = var.NAMESPACE
133+
134+
name = each.value.name
135+
repository = each.value.repository
136+
chart = each.value.chart
137+
version = each.value.version
138+
139+
values = each.value.values
140+
141+
create_namespace = true
142+
force_update = true
143+
recreate_pods = true
144+
reuse_values = false
145+
timeout = 600
146+
wait = false
147+
}

‎spartan/terraform/deploy-sepolia/variables.tf‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
variable "GCP_PROJECT_ID" {
2+
description = "GCP project id"
3+
type = string
4+
default = "testnet-440309"
5+
}
6+
7+
variable "GCP_REGION" {
8+
default = "us-west1"
9+
type = string
10+
}
11+
12+
variable "K8S_CLUSTER_CONTEXT" {
13+
description = "GKE cluster context"
14+
type = string
15+
default = "gke_testnet-440309_us-west1-a_aztec-gke-public"
16+
}
17+
18+
variable "NAMESPACE" {
19+
description = "The Kuberentes namespace to deploy into"
20+
type = string
21+
default = "sepolia"
22+
}

0 commit comments

Comments
 (0)