charts: add signet values and make chain selection work

Author: pinheadmz

resources/charts/bitcoincore/templates/configmap.yaml

@@ -10,6 +10,9 @@ data:
 
     {{ template "bitcoincore.check_semver" . }}
     {{- .Values.baseConfig | nindent 4 }}
+    rpcport={{ index .Values .Values.chain "RPCPort" }}
+    zmqpubrawblock=tcp://0.0.0.0:{{ .Values.ZMQBlockPort }}
+    zmqpubrawtx=tcp://0.0.0.0:{{ .Values.ZMQTxPort }}
     {{- .Values.config | nindent 4 }}
     {{- range .Values.connect }}
       {{- print "connect=" . | nindent 4}}

resources/charts/bitcoincore/templates/pod.yaml

@@ -29,21 +29,23 @@ spec:
       imagePullPolicy: {{ .Values.image.pullPolicy }}
       ports:
         - name: rpc
-          containerPort: {{ .Values.regtest.RPCPort }}
+          containerPort: {{ index .Values .Values.chain "RPCPort" }}
           protocol: TCP
         - name: p2p
-          containerPort: {{ .Values.regtest.P2PPort }}
+          containerPort: {{ index .Values .Values.chain "P2PPort" }}
           protocol: TCP
         - name: zmq-tx
-          containerPort: {{ .Values.regtest.ZMQTxPort }}
+          containerPort: {{ .Values.ZMQTxPort }}
           protocol: TCP
         - name: zmq-block
-          containerPort: {{ .Values.regtest.ZMQBlockPort }}
+          containerPort: {{ .Values.ZMQBlockPort }}
           protocol: TCP
       livenessProbe:
         {{- toYaml .Values.livenessProbe | nindent 8 }}
       readinessProbe:
         {{- toYaml .Values.readinessProbe | nindent 8 }}
+        tcpSocket:
+          port: {{ index .Values .Values.chain "RPCPort" }}
       resources:
         {{- toYaml .Values.resources | nindent 8 }}
       volumeMounts:
@@ -65,7 +67,7 @@ spec:
         - name: BITCOIN_RPC_HOST
           value: "127.0.0.1"
         - name: BITCOIN_RPC_PORT
-          value: "{{ .Values.regtest.RPCPort }}"
+          value: "{{ index .Values .Values.chain "RPCPort" }}"
         - name: BITCOIN_RPC_USER
           value: user
         - name: BITCOIN_RPC_PASSWORD

resources/charts/bitcoincore/templates/service.yaml

@@ -8,19 +8,19 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.regtest.RPCPort }}
+    - port: {{ index .Values .Values.chain "RPCPort" }}
       targetPort: rpc
       protocol: TCP
       name: rpc
-    - port: {{ .Values.regtest.P2PPort }}
+    - port: {{ index .Values .Values.chain "P2PPort" }}
       targetPort: p2p
       protocol: TCP
       name: p2p
-    - port: {{ .Values.regtest.ZMQTxPort }}
+    - port: {{ .Values.ZMQTxPort }}
       targetPort: zmq-tx
       protocol: TCP
       name: zmq-tx
-    - port: {{ .Values.regtest.ZMQBlockPort }}
+    - port: {{ .Values.ZMQBlockPort }}
       targetPort: zmq-block
       protocol: TCP
       name: zmq-block

resources/charts/bitcoincore/values.yaml

@@ -36,8 +36,13 @@ service:
 regtest:
   RPCPort: 18443
   P2PPort: 18444
-  ZMQTxPort: 28333
-  ZMQBlockPort: 28332
+
+signet:
+  RPCPort: 38332
+  P2PPort: 38333
+
+ZMQTxPort: 28333
+ZMQBlockPort: 28332
 
 ingress:
   enabled: false
@@ -82,8 +87,6 @@ readinessProbe:
   failureThreshold: 1
   periodSeconds: 1
   successThreshold: 1
-  tcpSocket:
-    port: 18443
   timeoutSeconds: 1
 
 
@@ -121,17 +124,12 @@ baseConfig: |
   capturemessages=1
   fallbackfee=0.00001000
   listen=1
-
-  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
+  # rpcport and zmq endpoints are configured by chain in configmap.yaml
 
 
 config: ""