Merge branch 'develop' into mywork

Author: suvajit-sarkar

README.md

@@ -1,7 +1,4 @@
 # Hyperledger Bevel [![join the chat][chat-image]][chat-url]
-<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors-)
-<!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [chat-url]: https://discord.gg/hyperledger
 [chat-image]: https://img.shields.io/discord/905194001349627914?logo=Hyperledger&style=plastic.svg
@@ -31,9 +28,18 @@ Hyperledger Bevel delivers an automation framework for rapidly and consistently
 
 ![What is Hyperledger Bevel?](./docs/images/hyperledger-bevel-overview.png "What is Hyperledger Bevel?")
 
-Hyperledger Bevel makes use of Ansible, Helm, and Kubernetes to deploy production DLT networks. Specifically, it makes use of Ansible for configuration of the network by DevOps Engineers. It then uses Helm charts as instructions for deploying the necessary components to Kubernetes. Kubernetes was chosen to allow for Hyperledger Bevel to deploy the DLT networks to any cloud that supports Kubernetes.
+Hyperledger Bevel is an accelerator/tool that helps developers rapidly set up and deploy secure, scalable and production-ready DLT network(s) that also allows new organizations to be easily on-boarded on the network. Bevel facilitates a safe and secure way of deploying and operating different DLT platforms.
 
-Hyperledger Bevel currently supports Corda, Hyperledger Fabric, Hyperledger Indy and Quorum. It is the intention to add support for Hyperledger Besu and Corda Enterprise in the near future. Other DLT platforms can easily be added.
+It includes: 
+- Helm charts to deploy different DLT nodes and to generate the related crypto/identities. 
+- Helm charts for various operational features like adding new nodes, and deploying smart contracts.
+- Helm charts to deploy Hyperledger Cacti connectors for Fabric, Quorum and Besu networks. 
+- Ansible playbooks and modular role definitions to automate the deployment of Helm charts.
+- Ansible playbooks and roles to automated deployment of Hyperledger fabric using  bevel-operator-fabric(Kubernetes operator for managing Hyperledger Fabric networks).
+- Integrated CD using GitOps so that once the network is set up, all changes can be done via git PRs/merges.
+- Configuration for Ambassador Edge Stack, HAProxy (for Hyperledger Fabric) and Isto Ingress (for Substrate) to act as Ingress Controller. 
+
+Hyperledger Bevel currently supports R3 Corda OS and Enterprise, Hyperledger Fabric, Hyperledger Indy, Hyperledger Besu, Quorum and Substrate. Other DLT platforms can easily be added.
 
 ### Getting Started
 
@@ -64,7 +70,7 @@ For Hyperledger Indy, we build Docker containers from our source code. A number
 ![Hyperledger Bevel - Indy](./docs/images/hyperledger-bevel-indy.png "Hyperledger Bevel for Hyperledger Indy")
 
 ### Quorum
-For Quorum, we use the official Docker containers provided by Quorum. A number of different Ansible scripts will allow you to either create a new network (across clouds) with choice of Consensus (between IBFT and RAFT) and a choice of Transaction Manager (between Tessera and Constellation).
+For Quorum, we use the official Docker containers provided by Quorum. A number of different Ansible scripts will allow you to either create a new network (across clouds) with choice of Consensus (between IBFT and RAFT) and a transaction Manager.
 
 ![Hyperledger Bevel - Quorum](./docs/images/hyperledger-bevel-quorum.png "Hyperledger Bevel for Quorum")
 
@@ -85,10 +91,10 @@ Please review [contributing](./CONTRIBUTING.md) guidelines to get started.
 If you are not using the provided Jenkins automation scripts, you can run the provisioning scripts within a docker runtime independent from your target Kubernetes cluster.
 ```
 # Build provisioning image
-docker build . -t hyperledgerlabs/baf-build
+docker build . -t ghcr.io/hyperledger/bevel-build
 
 # Run the provisioning scripts
-docker run -it -v $(pwd):/home/bevel/ hyperledgerlabs/baf-build
+docker run -it -v $(pwd):/home/bevel/ ghcr.io/hyperledger/bevel-build
 ```
 
 ## Initial Committers
@@ -99,28 +105,3 @@ docker run -it -v $(pwd):/home/bevel/ hyperledgerlabs/baf-build
 
 ## Sponsor
 Mark Wagner (Github: [n1zyz](https://github.com/n1zyz), email: [[email protected]](mailto:[email protected])) - TSC Member
-
-## Contributors ✨
-
-Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
-
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<table>
-  <tr>
-    <td align="center"><a href="https://github.com/alvaropicazo"><img src="https://avatars.githubusercontent.com/u/76157062?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alvaro Picazo</b></sub></a><br /><a href="#maintenance-alvaropicazo" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/suvajit-sarkar"><img src="https://avatars.githubusercontent.com/u/55580532?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Suvajit Sarkar</b></sub></a><br /><a href="https://github.com/hyperledger/bevel/commits?author=suvajit-sarkar" title="Code">💻</a> <a href="https://github.com/hyperledger/bevel/commits?author=suvajit-sarkar" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/deepakkumardbd"><img src="https://avatars.githubusercontent.com/u/57094817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Deepak Kumar</b></sub></a><br /><a href="https://github.com/hyperledger/bevel/commits?author=deepakkumardbd" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/jagpreetsinghsasan"><img src="https://avatars.githubusercontent.com/u/56861721?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jagpreet Singh Sasan</b></sub></a><br /><a href="https://github.com/hyperledger/bevel/commits?author=jagpreetsinghsasan" title="Code">💻</a> <a href="#maintenance-jagpreetsinghsasan" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/angelaalagbe"><img src="https://avatars.githubusercontent.com/u/54588164?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Angela.Alagbe</b></sub></a><br /><a href="https://github.com/hyperledger/bevel/commits?author=angelaalagbe" title="Documentation">📖</a> <a href="#content-angelaalagbe" title="Content">🖋</a></td>
-    <td align="center"><a href="https://github.com/mgCepeda"><img src="https://avatars.githubusercontent.com/u/83813093?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marina Gómez Cepeda</b></sub></a><br /><a href="https://github.com/hyperledger/bevel/commits?author=mgCepeda" title="Code">💻</a></td>
-  </tr>
-</table>
-
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

docs/images/hyperledger-bevel-overview.png

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: besu_connector
+name: besu-cacti-connector
 description: "Hyperledger Besu: Deploys Cactus Besu Connector"
 type: application
 version: '0.15.0'

platforms/hyperledger-besu/charts/besu-cacti-connector/Chart.yaml

@@ -169,22 +169,6 @@
         profile_name: "{{ item.channel_name }}"
       loop: "{{ network['channels'] }}"
 
-    # This role adds the new org to the existing consortium and updates the block  
-    
-    - include_role:
-        name: "create/new_organization/syschannel_block"
-      vars:
-        build_path: "./build"
-        orderers: "{{ org.services.orderers }}"
-        docker_url: "{{ network.docker.url }}"
-        channel_name: "syschannel"
-        update_type: "tls"
-        component_ns: "{{ org.name | lower}}-net"
-      loop: "{{ network.organizations }}"
-      loop_control:
-        loop_var: org
-      when: org.type == 'orderer' 
-
     # This role creates the value file for peers of organisations and write couch db credentials
     # to the vault.
     - include_role:
@@ -219,7 +203,6 @@
         name: "setup/config_block/sign_and_update"
       vars:
         build_path: "./build"
-        channel_sys: "syschannel"
         participants: "{{ item.participants }}"
         docker_url: "{{ network.docker.url }}"
       loop: "{{ network['channels'] }}"      

platforms/hyperledger-fabric/configuration/add-organization.yaml

@@ -173,7 +173,7 @@ networkServices:
 # external firewall (Bridge and Float)
 firewall:
   # enabled is a boolean value for the above function
-  enabled:
+  enabled: false
 
 service:
   # p2pPort defines the port number of inbound connections
@@ -219,7 +219,7 @@ dataSourceProperties:
     # Eg. url: "jdbc:h2:tcp://carrierdb:9101/persistence;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;WRITE_DELAY=100;AUTO_RECONNECT=TRUE;"
     url: 
     # Eg. dataSourceClassName: "org.h2.jdbcx.JdbcDataSource"
-    dataSourceClassName:
+    dataSourceClassName: " "
     # dbUrl: notarydb
     dbUrl:
     # dbPort: 9101

platforms/hyperledger-fabric/configuration/roles/create/new_organization/syschannel_block/tasks/main.yaml

@@ -10,7 +10,7 @@ spec:
   interval: 1m
   chart:
    spec:
-    chart: {{ charts_dir }}/cemm-pki-gen
+    chart: {{ charts_dir }}/cenm-pki-gen
     sourceRef:
       kind: GitRepository
       name: flux-{{ network.env.type }}

platforms/hyperledger-fabric/configuration/roles/create/new_organization/syschannel_block/templates/syschannel_update_script.tpl

@@ -35,7 +35,7 @@
     name: helm_component
   vars:
     type: "signer"
-    chart: "corda-signer"
+    chart: "cenm-signer"
     corda_service_version: signer-{{ org.version }}
     name: "{{ org.name | lower }}"
     component_name: "{{ org.services.signer.name }}"