From 482d28da9baddbda0c9cc703719f3f20db99633a Mon Sep 17 00:00:00 2001
From: "Sasha (Alejandro Vicente Grabovetsky)" <a.vicente.grab@gmail.com>
Date: Fri, 30 Nov 2018 18:27:45 +0200
Subject: [PATCH] [HLF-Peer] Add gossip (#9633)

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>
---
 stable/hlf-peer/Chart.yaml                     |  2 +-
 stable/hlf-peer/README.md                      |  5 +++++
 stable/hlf-peer/templates/configmap--peer.yaml | 16 +++++++++++++++-
 stable/hlf-peer/values.yaml                    |  7 +++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/stable/hlf-peer/Chart.yaml b/stable/hlf-peer/Chart.yaml
index 056e75c520..984582a6a7 100644
--- a/stable/hlf-peer/Chart.yaml
+++ b/stable/hlf-peer/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Hyperledger Fabric Peer chart (these charts are created by AID:Tech and are currently not directly associated with the Hyperledger project)
 name: hlf-peer
-version: 1.2.3
+version: 1.2.4
 appVersion: 1.3.0
 keywords:
   - blockchain
diff --git a/stable/hlf-peer/README.md b/stable/hlf-peer/README.md
index 030211ffdf..0d6250b184 100644
--- a/stable/hlf-peer/README.md
+++ b/stable/hlf-peer/README.md
@@ -91,6 +91,11 @@ The following table lists the configurable parameters of the Hyperledger Fabric
 | `peer.databaseType`                | Database type to use (`goleveldb` or `CouchDB`)      | `goleveldb`                                                |
 | `peer.couchdbInstance              | CouchDB chart name to use `cdb-peer1`                | `cdb-peer1`                                                |
 | `peer.mspID`                       | ID of MSP the Peer belongs to                        | `Org1MSP`                                                  |
+| `peer.gossip.bootstrap`            | Gossip bootstrap address                             | ``                                                         |
+| `peer.gossip.endpoint`             | Gossip endpoint                                      | ``                                                         |
+| `peer.gossip.externalEndpoint`     | Gossip external endpoint                             | ``                                                         |
+| `peer.gossip.orgLeader`            | Gossip organisation leader ("true"/"false")          | `"false"`                                                  |
+| `peer.gossip.useLeaderElection`    | Gossip use leader election                           | `"true"`                                                   |
 | `peer.tls.server.enabled`          | Do we enable server-side TLS?                        | `false`                                                    |
 | `peer.tls.client.enabled`          | Do we enable client-side TLS?                        | `false`                                                    |
 | `secrets.peer.cred`                | Credentials: 'CA_USERNAME' and 'CA_PASSWORD'         | ``                                                         |
diff --git a/stable/hlf-peer/templates/configmap--peer.yaml b/stable/hlf-peer/templates/configmap--peer.yaml
index 706b8c3d20..652ba5d596 100644
--- a/stable/hlf-peer/templates/configmap--peer.yaml
+++ b/stable/hlf-peer/templates/configmap--peer.yaml
@@ -19,9 +19,11 @@ data:
   CORE_PEER_PROFILE_ENABLED: "true"
   CORE_PEER_DISCOVERY_PERIOD: 60s
   CORE_PEER_DISCOVERY_TOUCHPERIOD: 60s
-  CORE_VM_ENDPOINT: unix:///host/var/run/docker.sock
   CORE_PEER_LOCALMSPID: {{ .Values.peer.mspID | quote }}
   CORE_PEER_MSPCONFIGPATH: /var/hyperledger/msp
+  ###########
+  # Logging #
+  ###########
   CORE_LOGGING_LEVEL: debug
   CORE_LOGGING_PEER: debug
   CORE_LOGGING_CAUTHDSL: debug
@@ -30,6 +32,17 @@ data:
   CORE_LOGGING_MSP: info
   CORE_LOGGING_POLICIES: debug
   CORE_LOGGING_GRPC: debug
+  ##########
+  # Gossip #
+  ##########
+  CORE_PEER_GOSSIP_BOOTSTRAP: {{ .Values.peer.gossip.bootstrap | quote }}
+  CORE_PEER_GOSSIP_ENDPOINT: {{ .Values.peer.gossip.endpoint | quote }}
+  CORE_PEER_GOSSIP_EXTERNALENDPOINT: {{ .Values.peer.gossip.externalEndpoint | quote }}
+  CORE_PEER_GOSSIP_ORGLEADER: {{ .Values.peer.gossip.orgLeader | quote }}
+  CORE_PEER_GOSSIP_USELEADERELECTION: {{ .Values.peer.gossip.useLeaderElection | quote }}
+  ##########
+  # TLS    #
+  ##########
   CORE_PEER_TLS_ENABLED: {{ .Values.peer.tls.server.enabled | quote }}
   CORE_PEER_TLS_CERT_FILE: "/var/hyperledger/tls/server/pair/tls.crt"
   CORE_PEER_TLS_KEY_FILE: "/var/hyperledger/tls/server/pair/tls.key"
@@ -39,6 +52,7 @@ data:
   CORE_PEER_TLS_CLIENTROOTCAS_FILES: "/var/hyperledger/tls/client/cert/*"
   CORE_PEER_TLS_CLIENTCERT_FILE: "/var/hyperledger/tls/client/pair/tls.crt"
   CORE_PEER_TLS_CLIENTKEY_FILE: "/var/hyperledger/tls/client/pair/tls.key"
+  CORE_VM_ENDPOINT: unix:///host/var/run/docker.sock
   CORE_LEDGER_STATE_STATEDATABASE: {{ .Values.peer.databaseType | quote }}
   # Containers in the same pod share the host
   {{- if eq .Values.peer.databaseType "CouchDB" }}
diff --git a/stable/hlf-peer/values.yaml b/stable/hlf-peer/values.yaml
index 95947f00c7..8b27a9cdbe 100644
--- a/stable/hlf-peer/values.yaml
+++ b/stable/hlf-peer/values.yaml
@@ -52,6 +52,13 @@ peer:
   couchdbInstance: cdb-peer1
   ## MSP ID of the Peer
   mspID: Org1MSP
+  gossip:
+    bootstrap: ""
+    endpoint: ""
+    externalEndpoint: ""
+    orgLeader: "false"
+    useLeaderElection: "true"
+
   tls:
     server:
       enabled: "false"