Skip to content

charts: split off defaultConfig from [node] config #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 3, 2024
Merged

charts: split off defaultConfig from [node] config #622

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f582a7f
charts: split off defaultConfig from [node] config
pinheadmz Oct 1, 2024
7bcbe06
add node-specific config values in 6_node_network
pinheadmz Oct 1, 2024
76f3387
test: cover defaultConfig / config options when creating network
pinheadmz Oct 3, 2024
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
1 change: 1 addition & 0 deletions resources/charts/bitcoincore/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 2 additions & 0 deletions resources/charts/bitcoincore/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ baseConfig: |

config: ""

defaultConfig: ""

connect: []
loadSnapshot:
enabled: false
Expand Down
2 changes: 1 addition & 1 deletion resources/networks/6_node_bitcoin/node-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ image:
# Overrides the image tag whose default is the chart appVersion.
tag: "27.0"

config: |
defaultConfig: |
dns=1
debug=rpc
2 changes: 1 addition & 1 deletion resources/networks/fork_observer/node-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions src/warnet/bitcoin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Copy link
Collaborator

@m3dwards m3dwards Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't there a reason this was in here?

Copy link
Contributor Author

@pinheadmz pinheadmz Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its up top now, i thought that might be what the linter was complaining about since it does not inform me, the guy trying to pass CI, what it was complaining about 🔥


blob = subprocess.run(
cmd, shell=True, capture_output=True, executable="bash"
Expand Down
2 changes: 1 addition & 1 deletion test/data/signet/node-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ chain: signet
spec:
restartPolicy: Always

config: |
defaultConfig: |
debug=rpc
debug=net
signetchallenge=0014d33b6e11ca95c4edccd8e986434358d79e919730