charts: split off defaultConfig from [node] config

Author: pinheadmz

resources/charts/bitcoincore/templates/configmap.yaml

@@ -13,6 +13,7 @@ data:
     rpcport={{ index .Values .Values.chain "RPCPort" }}
     zmqpubrawblock=tcp://0.0.0.0:{{ .Values.ZMQBlockPort }}
     zmqpubrawtx=tcp://0.0.0.0:{{ .Values.ZMQTxPort }}
+    {{- .Values.defaultConfig | nindent 4 }}
     {{- .Values.config | nindent 4 }}
     {{- range .Values.connect }}
       {{- print "connect=" . | nindent 4}}

resources/charts/bitcoincore/values.yaml

@@ -133,6 +133,8 @@ baseConfig: |
 
 config: ""
 
+defaultConfig: ""
+
 connect: []
 loadSnapshot:
   enabled: false

resources/networks/6_node_bitcoin/node-defaults.yaml

@@ -21,6 +21,6 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: "27.0"
 
-config: |
+defaultConfig: |
   dns=1
   debug=rpc

resources/networks/fork_observer/node-defaults.yaml

@@ -21,7 +21,7 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: "27.0"
 
-config: |
+defaultConfig: |
   dns=1
   debug=rpc
   rpcauth=forkobserver:1418183465eecbd407010cf60811c6a0$d4e5f0647a63429c218da1302d7f19fe627302aeb0a71a74de55346a25d8057c

src/warnet/bitcoin.py

@@ -1,14 +1,14 @@
 import os
 import re
+import subprocess
 import sys
 from datetime import datetime
 from io import BytesIO
 
 import click
-from urllib3.exceptions import MaxRetryError
-
 from test_framework.messages import ser_uint256
 from test_framework.p2p import MESSAGEMAP
+from urllib3.exceptions import MaxRetryError
 
 from .k8s import get_default_namespace, get_mission
 from .process import run_command
@@ -187,7 +187,6 @@ def get_messages(tank_a: str, tank_b: str, chain: str):
                 file_path = f"{base_dir}/{dir_name}/{file}"
                 # Fetch the file contents from the container
                 cmd = f"kubectl exec {tank_a} -- cat {file_path}"
-                import subprocess
 
                 blob = subprocess.run(
                     cmd, shell=True, capture_output=True, executable="bash"

test/data/signet/node-defaults.yaml

@@ -8,7 +8,7 @@ chain: signet
 spec:
   restartPolicy: Always
 
-config: |
+defaultConfig: |
   debug=rpc
   debug=net
   signetchallenge=0014d33b6e11ca95c4edccd8e986434358d79e919730