charts: make bitcoin config chain-agnostic

Author: pinheadmz

resources/charts/bitcoincore/templates/_helpers.tpl

@@ -60,10 +60,10 @@ Create the name of the service account to use
 {{/*
 Add network section heading in bitcoin.conf after v0.17.0
 */}}
-{{- define "bitcoincore.check_semver.regtest" -}}
+{{- define "bitcoincore.check_semver" -}}
 {{- $tag := .Values.image.tag | trimPrefix "v" -}}
 {{- $version := semverCompare ">=0.17.0" $tag -}}
 {{- if $version -}}
-[regtest]
+[{{ .Values.chain }}]
 {{- end -}}
 {{- end -}}

resources/charts/bitcoincore/templates/configmap.yaml

@@ -6,12 +6,9 @@ metadata:
     {{- include "bitcoincore.labels" . | nindent 4 }}
 data:
   bitcoin.conf: |
-    {{- if eq .Values.chain "regtest" }}
-    regtest=1
+    {{ .Values.chain }}=1
 
-    {{ template "bitcoincore.check_semver.regtest" . }}
-      {{- tpl .Values.regtestConfig . | nindent 4 }}
-    {{- end }}
+    {{ template "bitcoincore.check_semver" . }}
     {{- .Values.baseConfig | nindent 4 }}
     {{- .Values.config | nindent 4 }}
     {{- range .Values.connect }}

resources/charts/bitcoincore/values.yaml

@@ -112,14 +112,6 @@ collectLogs: false
 metricsExport: false
 prometheusMetricsPort: 9332
 
-regtestConfig: |
-  rpcuser=user
-  rpcpassword=password
-  rpcport=18443
-  rpcallowip=0.0.0.0/0
-  rpcbind=0.0.0.0
-  rest=1
-
 baseConfig: |
   checkmempool=0
   acceptnonstdtxn=1
@@ -133,6 +125,15 @@ baseConfig: |
   zmqpubrawblock=tcp://0.0.0.0:28332
   zmqpubrawtx=tcp://0.0.0.0:28333
 
+  rpcuser=user
+  rpcpassword=password
+  # use regtest port by default for all networks
+  rpcport=18443
+  rpcallowip=0.0.0.0/0
+  rpcbind=0.0.0.0
+  rest=1
+
+
 config: ""
 
 connect: []

test/data/signet/network.yaml

@@ -0,0 +1,8 @@
+nodes:
+  - name: miner
+  - name: tank-0001
+    connect:
+      - miner
+  - name: tank-0002
+    connect:
+      - miner

test/data/signet/node-defaults.yaml

@@ -0,0 +1,6 @@
+image:
+  repository: bitcoindevproject/bitcoin
+  pullPolicy: IfNotPresent
+  tag: "27.0"
+
+chain: signet