Merge pull request #643 from willcl-ark/addnode-not-connect

Use addnode instead of connect

Author: pinheadmz

resources/charts/bitcoincore/templates/configmap.yaml

@@ -16,6 +16,6 @@ data:
     zmqpubrawtx=tcp://0.0.0.0:{{ .Values.ZMQTxPort }}
     {{- .Values.defaultConfig | nindent 4 }}
     {{- .Values.config | nindent 4 }}
-    {{- range .Values.connect }}
-      {{- print "connect=" . | nindent 4}}
-    {{- end }}
+    {{- range .Values.addnode }}
+      {{- print "addnode=" . | nindent 4}}
+    {{- end }}

resources/charts/bitcoincore/templates/pod.yaml

@@ -15,7 +15,7 @@ metadata:
     collect_logs: "true"
     {{- end }}
   annotations:
-    init_peers: "{{ .Values.connect | len }}"
+    init_peers: "{{ .Values.addnode | len }}"
 spec:
   restartPolicy: "{{ .Values.restartPolicy }}"
   {{- with .Values.imagePullSecrets }}

resources/charts/bitcoincore/values.yaml

@@ -136,7 +136,8 @@ config: ""
 
 defaultConfig: ""
 
-connect: []
+addnode: []
+
 loadSnapshot:
   enabled: false
   url: ""

resources/charts/commander/templates/configmap.yaml

@@ -65,6 +65,4 @@ volumeMounts: []
 
 port:
 
-warnet: ""
-
 args: ""

resources/charts/commander/values.yaml

@@ -3,7 +3,7 @@ nodes:
     config: uacomment=tank0001
     image:
       tag: "26.0"
-    connect:
+    addnode:
       - tank-0002
       - tank-0003
   - name: tank-0002
@@ -15,22 +15,22 @@ nodes:
       requests:
         cpu: 100m
         memory: 128Mi
-    connect:
+    addnode:
       - tank-0003
       - tank-0004
   - name: tank-0003
     config: uacomment=tank0003
-    connect:
+    addnode:
       - tank-0004
       - tank-0005
   - name: tank-0004
     config: uacomment=tank0004
-    connect:
+    addnode:
       - tank-0005
       - tank-0006
   - name: tank-0005
     config: uacomment=tank0005
-    connect:
+    addnode:
       - tank-0006
   - name: tank-0006
 caddy:

resources/networks/6_node_bitcoin/network.yaml

@@ -38,11 +38,11 @@ def custom_graph(
     connections = set()
 
     for i in range(num_nodes):
-        node = {"name": f"tank-{i:04d}", "connect": [], "image": {"tag": version}}
+        node = {"name": f"tank-{i:04d}", "addnode": [], "image": {"tag": version}}
 
         # Add round-robin connection
         next_node = (i + 1) % num_nodes
-        node["connect"].append(f"tank-{next_node:04d}")
+        node["addnode"].append(f"tank-{next_node:04d}")
         connections.add((i, next_node))
 
         # Add random connections
@@ -55,7 +55,7 @@ def custom_graph(
             random_node = random.choice(available_nodes)
             # Avoid circular loops of A -> B -> A
             if (random_node, i) not in connections:
-                node["connect"].append(f"tank-{random_node:04d}")
+                node["addnode"].append(f"tank-{random_node:04d}")
                 connections.add((i, random_node))
                 available_nodes.remove(random_node)
 

src/warnet/graph.py

@@ -1,61 +1,61 @@
 nodes:
   - name: tank-0000
-    connect:
+    addnode:
       - tank-0001
     config: |
       debug=rpc
       debug=validation
   - name: tank-0001
-    connect:
+    addnode:
       - tank-0002
     config: |
       debug=net
       debug=validation
   - name: tank-0002
-    connect:
+    addnode:
       - tank-0003
     config: |
       debug=validation
   - name: tank-0003
-    connect:
+    addnode:
       - tank-0004
     config: |
       debug=validation
   - name: tank-0004
-    connect:
+    addnode:
       - tank-0005
   - name: tank-0005
-    connect:
+    addnode:
       - tank-0006
     config: |
       debug=validation
   - name: tank-0006
-    connect:
+    addnode:
       - tank-0007
   - name: tank-0007
     config: |
       debug=validation
-    connect:
+    addnode:
       - tank-0008
     config: |
       debug=validation
   - name: tank-0008
-    connect:
+    addnode:
       - tank-0009
     config: |
       debug=validation
   - name: tank-0009
-    connect:
+    addnode:
       - tank-0010
     config: |
       debug=validation
   - name: tank-0010
-    connect:
+    addnode:
       - tank-0011
     config: |
       debug=validation
   - name: tank-0011
-    connect:
+    addnode:
       - tank-0000
     config: |
       debug=validation

test/data/12_node_ring/network.yaml

@@ -2,7 +2,7 @@ nodes:
   - name: tank-0001
     image:
       tag: "26.0"
-    connect:
+    addnode:
       - tank-0002.wargames-red-team-warnettest.svc.cluster.local
       - tank-0003.wargames-blue-team-warnettest.svc.cluster.local
   - name: tank-0002
@@ -13,19 +13,19 @@ nodes:
       requests:
         cpu: 100m
         memory: 128Mi
-    connect:
+    addnode:
       - tank-0003.wargames-red-team-warnettest.svc.cluster.local
       - tank-0004.wargames-blue-team-warnettest.svc.cluster.local
   - name: tank-0003
-    connect:
+    addnode:
       - tank-0004.wargames-red-team-warnettest.svc.cluster.local
       - tank-0005.wargames-blue-team-warnettest.svc.cluster.local
   - name: tank-0004
-    connect:
+    addnode:
       - tank-0005.wargames-red-team-warnettest.svc.cluster.local
       - tank-0006.wargames-blue-team-warnettest.svc.cluster.local
   - name: tank-0005
-    connect:
+    addnode:
       - tank-0006.wargames-red-team-warnettest.svc.cluster.local
   - name: tank-0006
 fork_observer:

test/data/admin/networks/6_node_bitcoin/network.yaml

@@ -2,63 +2,63 @@ nodes:
   - name: tank-0016
     image:
       tag: "0.16.1"
-    connect:
+    addnode:
       - tank-0017
     config:
       uacomment=tank-0016
   - name: tank-0017
     image:
       tag: "0.17.0"
-    connect:
+    addnode:
       - tank-0019
     config:
       uacomment=tank-0017
   - name: tank-0019
     image:
       tag: "0.19.2"
-    connect:
+    addnode:
       - tank-0020
     config:
       uacomment=tank-0019
   - name: tank-0020
     image:
       tag: "0.20.0"
-    connect:
+    addnode:
       - tank-0021
     config:
       uacomment=tank-0020
   - name: tank-0021
     image:
       tag: "0.21.1"
-    connect:
+    addnode:
       - tank-0024
     config:
       uacomment=tank-0021
   - name: tank-0024
     image:
       tag: "24.2"
-    connect:
+    addnode:
       - tank-0025
     config:
       uacomment=tank-0024
   - name: tank-0025
     image:
       tag: "25.1"
-    connect:
+    addnode:
       - tank-0026
     config:
       uacomment=tank-0025
   - name: tank-0026
     image:
       tag: "26.0"
-    connect:
+    addnode:
       - tank-0027
     config:
       uacomment=tank-0026
   - name: tank-0027
     image:
       tag: "27.0"
-    connect:
+    addnode:
       - tank-0016
     config:
       uacomment=tank-0027

test/data/bitcoin_conf/network.yaml

@@ -1,15 +1,15 @@
 nodes:
   - name: tank-0000
-    connect:
+    addnode:
       - tank-0002
     metricsExport: true
   - name: tank-0001
-    connect:
+    addnode:
       - tank-0002
     metricsExport: true
     metrics: txrate=getchaintxstats(10)["txrate"]
   - name: tank-0002
-    connect:
+    addnode:
       - tank-0000
 caddy:
   enabled: true

test/data/logging/network.yaml

@@ -6,7 +6,7 @@ nodes:
       rpcauth=forkobserver:1418183465eecbd407010cf60811c6a0$d4e5f0647a63429c218da1302d7f19fe627302aeb0a71a74de55346a25d8057c
       rpcwhitelist=forkobserver:getchaintips,getblockheader,getblockhash,getblock,getnetworkinfo
       rpcwhitelistdefault=0
-    connect:
+    addnode:
       - paul
   - name: paul
     config: |
@@ -22,7 +22,7 @@ nodes:
       rpcauth=forkobserver:1418183465eecbd407010cf60811c6a0$d4e5f0647a63429c218da1302d7f19fe627302aeb0a71a74de55346a25d8057c
       rpcwhitelist=forkobserver:getchaintips,getblockheader,getblockhash,getblock,getnetworkinfo
       rpcwhitelistdefault=0
-    connect:
+    addnode:
       - ringo
   - name: ringo
     config: |

test/data/services/network.yaml

@@ -3,50 +3,50 @@ nodes:
   - name: tank-1
     image:
       tag: "0.16.1"
-    connect:
+    addnode:
       - miner
   - name: tank-2
     image:
       tag: "0.17.0"
-    connect:
+    addnode:
       - miner
   - name: tank-3
     image:
       tag: "0.19.2"
-    connect:
+    addnode:
       - miner
   - name: tank-4
     image:
       tag: "0.20.0"
-    connect:
+    addnode:
       - miner
   - name: tank-5
     image:
       tag: "0.21.1"
-    connect:
+    addnode:
       - miner
   - name: tank-6
     image:
       tag: "24.2"
-    connect:
+    addnode:
       - miner
   - name: tank-7
     image:
       tag: "25.1"
-    connect:
+    addnode:
       - miner
   - name: tank-8
     image:
       tag: "26.0"
-    connect:
+    addnode:
       - miner
   - name: tank-9
     image:
       tag: "27.0"
-    connect:
+    addnode:
       - miner
   - name: tank-10
     image:
       tag: "0.16.1"
-    connect:
+    addnode:
       - miner

test/data/signet/network.yaml

@@ -22,7 +22,7 @@ nodes:
     config: |
       debug=validation
   - name: tank-0008
-    connect:
+    addnode:
       - tank-0009
     config: |
       debug=validation