disable peer block gossiping with config blockGossipEnabled flag (#146)

defaultconfig/peer/v2/core.yaml

@@ -366,6 +366,12 @@ peer:
 
     # Delivery service related config
     deliveryclient:
+        # Enables this peer to disseminate blocks it pulled from the ordering service
+        # via gossip.
+        # Note that 'gossip.state.enabled' controls point to point block replication
+        # of blocks committed in the past.
+        blockGossipEnabled: false
+
         # It sets the total time the delivery service may spend in reconnection
         # attempts until its retry logic gives up and returns an error
         reconnectTotalTimeThreshold: 3600s

defaultconfig/peer/v25/core.yaml

@@ -369,6 +369,12 @@ peer:
 
     # Delivery service related config
     deliveryclient:
+        # Enables this peer to disseminate blocks it pulled from the ordering service
+        # via gossip.
+        # Note that 'gossip.state.enabled' controls point to point block replication
+        # of blocks committed in the past.
+        blockGossipEnabled: false
+
         # It sets the total time the delivery service may spend in reconnection
         # attempts until its retry logic gives up and returns an error
         reconnectTotalTimeThreshold: 3600s

pkg/offering/base/peer/override/deployment.go

@@ -448,6 +448,9 @@ func (o *Override) V2Deployment(instance *current.IBPPeer, deployment *dep.Deplo
 		peerContainer.AppendEnvIfMissing("CORE_PEER_KEEPALIVE_CLIENT_INTERVAL", "30s")
 		peerContainer.AppendEnvIfMissing("CORE_PEER_KEEPALIVE_DELIVERYCLIENT_INTERVAL", "30s")
 
+		// Disable the flag peer.deliveryclient.blockGossipEnabled for existing v2 peers
+		peerContainer.AppendEnvIfMissing("CORE_PEER_DELIVERYCLIENT_BLOCKGOSSIPENABLED", "false")
+
 		// Will delete these envs if found, these are not required for v2
 		peerContainer.DeleteEnv("CORE_VM_ENDPOINT")
 		peerContainer.DeleteEnv("CORE_CHAINCODE_GOLANG_RUNTIME")