fix conflicts

AztecProtocol · Nov 13, 2024 · 9202220 · 9202220
1 parent 0a8eb44
commit 9202220
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml
@@ -83,7 +83,7 @@ validator:
     p2pUdpPort: 40400
     nodePort: 8080
   logLevel: "debug"
-  debug: "aztec:*,-aztec:avm_simulator*,discv5*,-aztec:circuits:artifact_hash,-json-rpc*,-aztec:world-state:database,-aztec:l2_block_stream*"
+  debug: "aztec:*,-aztec:avm_simulator*,-aztec:libp2p_service*,-aztec:circuits:artifact_hash,-json-rpc*,-aztec:l2_block_stream,-aztec:world-state:database"
   sequencer:
     maxSecondsBetweenBlocks: 0
     minTxsPerBlock: 1
@@ -114,7 +114,7 @@ proverNode:
     p2pUdpPort: 40400
     nodePort: 8080
   logLevel: "debug"
-  debug: "aztec:*,-aztec:avm_simulator*,discv5*,-aztec:circuits:artifact_hash,-json-rpc*,-aztec:world-state:database,-aztec:l2_block_stream*"
+  debug: "aztec:*,-aztec:avm_simulator*,-aztec:libp2p_service*,-aztec:circuits:artifact_hash,-json-rpc*,-aztec:l2_block_stream,-aztec:world-state:database"
   realProofs: false
   proverAgentEnabled: false
   resources:
@@ -147,6 +147,7 @@ pxe:
 
 bot:
   enabled: true
+  nodeUrl: ""
   logLevel: "debug"
   debug: "aztec:*,-aztec:avm_simulator*,-aztec:libp2p_service*,-aztec:circuits:artifact_hash,-json-rpc*,-aztec:l2_block_stream,-aztec:world-state:database"
   replicas: 1

diff --git a/spartan/metrics/values/gke-autopilot.yaml b/spartan/metrics/values/gke-autopilot.yaml
@@ -1,3 +1,4 @@
+# This file isn't used by default. It is here if you need to install metrics on GKE autopilot.
 prometheus:
   prometheus-node-exporter:
     enabled: false