update(besu,quorum): adapt besu & quorum ansible tasks and template f…

…iles to charts (#2562)

Signed-off-by: alvaropicazo <[email protected]>

platforms/hyperledger-besu/charts/besu-node/templates/besu-config-configmap.yaml

@@ -27,7 +27,7 @@ data:
     node-private-key-file={{.Values.node.besu.privateKeyPath | quote }}
 
     # Transaction Pool
-    tx-pool-layer-max-capacity={{ .Values.node.besu.txPool.maxCapacity }}
+    tx-pool-max-size={{ .Values.node.besu.txPool.maxCapacity }}
 
     {{ if  .Values.node.besu.p2p.enabled -}}
     # P2P network

platforms/hyperledger-besu/configuration/roles/create/helm_component/templates/member.tpl

@@ -60,10 +60,12 @@ spec:
 {% endif %}
       tessera:
         removeKeysOnDelete: true
+{% if org.type == 'member' or org.type is not defined %}
         peerNodes: 
 {% for tm_node in network.config.tm_nodes %}
           - url: {{ tm_node | quote }}
 {% endfor %}
+{% endif %}
         resources:
           cpuLimit: 0.25
           cpuRequest: 0.05
@@ -105,7 +107,7 @@ spec:
         tag: {{ network.version }}
     node:
       removeKeysOnDelete: false
-      isBootnode: {{ peer.bootnode | default(false) }}
+      isBootnode: false
       usesBootnodes: false
       besu:
         identity: {{ peer.subject | quote }}

platforms/hyperledger-besu/configuration/roles/create/member/tasks/main.yaml

@@ -10,7 +10,14 @@
     name: setup/genesis/secondary
   vars:
     values_dir: "./build/{{ component_ns }}"
+  when: org.type == 'member'
 
+# Get the Genesis and staticnodes
+- name: Get genesis and staticnodes
+  include_role: 
+    name: get/genesis
+  when: org.type == 'member' and org.services.peers is defined
+
 # Creates the Besu node value files for each node of organization
 - name: Create value file for Besu node
   include_role:
@@ -44,21 +51,3 @@
     component_name: "{{ member.name | lower }}"
     namespace: "{{ component_ns }}"
   when: org.services.peers is defined
-
-# Get the Genesis and staticnodes
-- name: Get genesis and staticnodes
-  include_role: 
-    name: get/genesis
-  when: org.services.peers is defined
-
-# Add the enode of new organizations to each of the existing nodes using rpc call only when ambassador is used
-- name: Adding the enode of new peer to all existing peer.
-  include_role: 
-    name: setup/new_member
-  loop: "{{ org.services.peers }}"
-  loop_control:
-    loop_var: peer
-  when:
-    - org.services.peers is defined
-    - network.config.besu_nodes is defined
-    - network.env.proxy == 'ambassador'

platforms/network-schema.json

@@ -2633,6 +2633,11 @@
         },
         "bootnode": {
           "$ref": "#/definitions/quorum_config_bootnode"
+        },
+        "accounts": {
+          "type": "array",
+          "minItems": 0,
+          "description": "Array of accounts which start with default ETH"
         }
       },
       "required": [

platforms/quorum/charts/README.md

@@ -115,7 +115,7 @@ helm install supplychain ./quorum-node --namespace supplychain-quo --values ./va
 ### Setting Up Another Member in a Different Namespace
 
 ```bash
-# Get the genesis and static nodes from existing member and and place them in the directory 'besu-genesis/files'
+# Get the genesis and static nodes from existing member and and place them in the directory 'quorum-genesis/files'
 cd ./quorum-genesis/files/
 kubectl --namespace supplychain-quo get configmap quorum-peers -o jsonpath='{.data.static-nodes\.json}' > static-nodes.json
 kubectl --namespace supplychain-quo get configmap quorum-genesis  -o jsonpath='{.data.genesis\.json}' > genesis.json

platforms/quorum/charts/quorum-genesis/Chart.yaml

@@ -1,5 +1,4 @@
-# apiVersion: v2
-apiVersion: v1
+apiVersion: v2
 name: quorum-genesis
 description: "Quorum: This Helm chart deploys genesis."
 type: application