Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions .github/workflows/deploy-irm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_call:
inputs:
network:
description: "Network that IRM will be monitoring e.g. testnet, staging-ignition..."
description: "Network that IRM will be monitoring e.g. testnet..."
required: true
type: string
default: "testnet"
Expand Down Expand Up @@ -41,7 +41,7 @@ on:
workflow_dispatch:
inputs:
network:
description: "Network that IRM will be monitoring e.g. testnet, staging-ignition..."
description: "Network that IRM will be monitoring e.g. testnet..."
required: true
type: string
default: "testnet"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ on:
workflow_dispatch:
inputs:
network:
description: "Network to deploy (e.g., staging-public, staging-ignition, testnet, next-net)"
description: "Network to deploy (e.g., staging-public, testnet, next-net)"
required: true
type: choice
options:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/deploy-staging-public.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Deploy to staging-public

on:
workflow_run:
workflows: ["Nightly Release Tag (v4-next)"]
types:
- completed
workflow_dispatch:
inputs:
tag:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ensure-funded-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_call:
inputs:
environment:
description: 'Environment to fund (e.g., staging-public, next-net, staging-ignition, testnet)'
description: 'Environment to fund (e.g., staging-public, next-net, testnet)'
required: true
type: string
low_watermark:
Expand All @@ -32,7 +32,6 @@ on:
options:
- staging-public
- next-net
- staging-ignition
- testnet
- devnet
- tps-scenario
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/metrics-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ jobs:
GRAFANA_DASHBOARD_PASSWORD_SECRET_NAME: ${{ inputs.grafana_dashboard_password_secret_name }}
SLACK_WEBHOOK_URL_SECRET_NAME: slack-webhook-url
SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME: slack-webhook-staging-public-url
SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME: slack-webhook-staging-ignition-url
SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME: slack-webhook-next-scenario-url
SLACK_WEBHOOK_NEXT_NET_SECRET_NAME: slack-webhook-next-net-url
SLACK_WEBHOOK_TESTNET_SECRET_NAME: slack-webhook-testnet-url
Expand Down Expand Up @@ -164,7 +163,6 @@ jobs:
-var="GRAFANA_PASSWORD_SECRET_NAME=${{ env.GRAFANA_DASHBOARD_PASSWORD_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_SECRET_NAME=${{ env.SLACK_WEBHOOK_URL_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME=${{ env.SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME=${{ env.SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME=${{ env.SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_NEXT_NET_SECRET_NAME=${{ env.SLACK_WEBHOOK_NEXT_NET_SECRET_NAME }}" \
-lock=${{ inputs.respect_tf_lock }}
Expand All @@ -179,7 +177,6 @@ jobs:
-var="GRAFANA_PASSWORD_SECRET_NAME=${{ env.GRAFANA_DASHBOARD_PASSWORD_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_SECRET_NAME=${{ env.SLACK_WEBHOOK_URL_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME=${{ env.SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME=${{ env.SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME=${{ env.SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME }}" \
-var="SLACK_WEBHOOK_NEXT_NET_SECRET_NAME=${{ env.SLACK_WEBHOOK_NEXT_NET_SECRET_NAME }}" \
-out=tfplan \
Expand Down
2 changes: 1 addition & 1 deletion docs/static/typescript-api/mainnet/foundation.md
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ type NetworkConfigMap = z.infer<typeof NetworkConfigMapSchema>

### NetworkNames
```typescript
type NetworkNames = "local" | "staging-ignition" | "staging-public" | "testnet" | "mainnet" | "next-net" | "devnet"
type NetworkNames = "local" | "staging-public" | "testnet" | "mainnet" | "next-net" | "devnet"
```

### PartialBy
Expand Down
42 changes: 0 additions & 42 deletions spartan/environments/staging-ignition.env

This file was deleted.

12 changes: 0 additions & 12 deletions spartan/metrics/grafana/alerts/policies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ policies:
- =~
- $STAGING_PUBLIC_REGEX

# Staging Ignition - by namespace
- receiver: "Slack #alerts-staging-ignition by namespace"
object_matchers:
- - k8s_namespace_name
- =~
- $STAGING_IGNITION_REGEX
# Staging Ignition - by network label
- receiver: "Slack #alerts-staging-ignition by network"
object_matchers:
- - network
- =~
- $STAGING_IGNITION_REGEX

# Next Scenario - by namespace
- receiver: "Slack #alerts-next-scenario by namespace"
Expand Down
4 changes: 2 additions & 2 deletions spartan/metrics/grafana/dashboards/bootnodes.json
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,8 @@
{
"current": {
"selected": false,
"text": "staging-ignition",
"value": "staging-ignition"
"text": "staging-public",
"value": "staging-public"
},
"datasource": {
"type": "prometheus",
Expand Down
4 changes: 2 additions & 2 deletions spartan/metrics/irm-monitor/alerting/alert-rules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ groups:
datasourceUid: grafanacloud-prom
model:
editorMode: code
expr: changes(rollup_pending_block_number{network!="staging-ignition"}[40m])
expr: changes(rollup_pending_block_number[40m])
instant: true
intervalMs: 1000
legendFormat: __auto
Expand All @@ -33,7 +33,7 @@ groups:
type: prometheus
uid: grafanacloud-prom
editorMode: code
expr: rollup_pending_block_number{network!="staging-ignition"}
expr: rollup_pending_block_number
instant: true
intervalMs: 1000
legendFormat: __auto
Expand Down
3 changes: 1 addition & 2 deletions spartan/metrics/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,8 @@ grafana:
server:
domain:
env:
PRODUCTION_NAMESPACES_REGEX: "v2-testnet|staging-public|staging-ignition"
PRODUCTION_NAMESPACES_REGEX: "v2-testnet|staging-public"
STAGING_PUBLIC_REGEX: "staging-public"
STAGING_IGNITION_REGEX: "staging-ignition|ignition-fisherman-sepolia"
NEXT_SCENARIO_REGEX: "v[0-9]+-scenario|next-scenario"
NEXT_NET_REGEX: "next-net"
TESTNET_NAMESPACES_REGEX: "testnet|v[0-9]+-testnet"
Expand Down
1 change: 0 additions & 1 deletion spartan/scripts/check_env_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ EXCLUDED_VARS_ARRAY=(
"SERVICE"
"SLACK_WEBHOOK_SECRET_NAME"
"SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME"
"SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME"
"SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME"
"SLACK_WEBHOOK_NEXT_NET_SECRET_NAME"
"SLACK_WEBHOOK_TESTNET_SECRET_NAME"
Expand Down
2 changes: 1 addition & 1 deletion spartan/scripts/network_pause.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ if kubectl get cronjob "$SNAPSHOT_CRONJOB" -n "$NAMESPACE" &>/dev/null; then
log "Snapshotting $NAMESPACE"
$scripts_dir/manual_snapshot.sh $NAMESPACE
log "Waiting for snapshot upload"
sleep 60 # staging-ignition takes 28s
sleep 60
else
log "Snapshot cronjob not found ($SNAPSHOT_CRONJOB), skipping snapshot"
fi
Expand Down
1 change: 0 additions & 1 deletion spartan/terraform/deploy-metrics/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ resource "helm_release" "aztec-gke-cluster" {
data = [
{ secretKey = "SLACK_WEBHOOK_URL", remoteRef = { key = var.SLACK_WEBHOOK_SECRET_NAME } },
{ secretKey = "SLACK_WEBHOOK_STAGING_PUBLIC_URL", remoteRef = { key = var.SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME } },
{ secretKey = "SLACK_WEBHOOK_STAGING_IGNITION_URL", remoteRef = { key = var.SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME } },
{ secretKey = "SLACK_WEBHOOK_NEXT_SCENARIO_URL", remoteRef = { key = var.SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME } },
{ secretKey = "SLACK_WEBHOOK_NEXT_NET_URL", remoteRef = { key = var.SLACK_WEBHOOK_NEXT_NET_SECRET_NAME } },
{ secretKey = "SLACK_WEBHOOK_DEVNET_URL", remoteRef = { key = var.SLACK_WEBHOOK_DEVNET_SECRET_NAME } },
Expand Down
6 changes: 0 additions & 6 deletions spartan/terraform/deploy-metrics/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@ variable "SLACK_WEBHOOK_STAGING_PUBLIC_SECRET_NAME" {
default = "slack-webhook-staging-public-url"
}

variable "SLACK_WEBHOOK_STAGING_IGNITION_SECRET_NAME" {
description = "Webhook for staging-ignition alerts"
type = string
default = "slack-webhook-staging-ignition-url"
}

variable "SLACK_WEBHOOK_NEXT_SCENARIO_SECRET_NAME" {
description = "Webhook for next-scenario alerts"
type = string
Expand Down
3 changes: 1 addition & 2 deletions yarn-project/BRANCHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,12 @@ Functionally, it is `v1`.
It deploys the following networks:

- staging-public, which is used to test changes before releasing to testnet
- staging-ignition, which is use to test changes before releasing to mainnet

Release-please has been configured on `v2`. When the release-please PR is merged, it creates a clean tag at the next minor version.

For example, at the time of writing, we are at `v2.0.3-rc.4`. When the release please PR is merged, it will create a tag `v2.0.4`.

This will cause ci3.yml to run a release, and then deploy-staging-networks.yml to run and deploy the two networks mentioned above as well as `testnet`.
This will cause ci3.yml to run a release, and then deploy-staging-networks.yml to run and deploy the staging network mentioned above as well as `testnet`.

#### hotfixes

Expand Down
3 changes: 0 additions & 3 deletions yarn-project/foundation/src/config/network_name.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export type NetworkNames =
| 'local'
| 'staging-ignition'
| 'staging-public'
| 'testnet'
| 'mainnet'
Expand All @@ -12,8 +11,6 @@ export function getActiveNetworkName(name?: string): NetworkNames {
const network = name || process.env.NETWORK;
if (!network || network === '' || network === 'local') {
return 'local';
} else if (network === 'staging-ignition') {
return network;
} else if (network === 'staging-public') {
return network;
} else if (network === 'testnet' || network === 'alpha-testnet') {
Expand Down
Loading