Merge pull request #356 from kaleido-io/helm-fabric-support

[helm] Fabconnect Support

Author: peterbroadhurst

deploy/charts/firefly/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: firefly
 description: A Helm chart for deploying FireFly and FireFly HTTPS Dataexchange onto Kubernetes.
 type: application
-appVersion: "0.11.1"
+appVersion: "0.11.2"
 version: "0.1.0"
 
 maintainers:

deploy/charts/firefly/ci/it-values.yaml renamed to deploy/charts/firefly/ci/eth-values.yaml

@@ -0,0 +1,25 @@
+config:
+  debugEnabled: true
+  adminEnabled: true
+  preInit: true
+
+  organizationName: "firefly-os"
+  organizationKey: "firefly-os"
+
+  fabconnectUrl: "http://fabconnect.firefly-os"
+
+  postgresUrl: "postgres://postgres:[email protected]:5432?sslmode=disable"
+  postgresAutomigrate: true
+
+  ipfsApiUrl: "http://ipfs.firefly-os:5001"
+  ipfsGatewayUrl: "http://ipfs.firefly-os:8080"
+
+dataexchange:
+  certificate:
+    enabled: true
+    issuerRef:
+      kind: ClusterIssuer
+      name: selfsigned-ca
+
+  tlsSecret:
+    enabled: false

deploy/charts/firefly/ci/fab-values.yaml

@@ -119,7 +119,9 @@ blockchain:
     ethconnect:
       url: {{ tpl .Values.config.ethconnectUrl . }}
       instance: {{ .Values.config.fireflyContractAddress }}
-      topic: "0" # TODO should likely be configurable
+      topic: {{ .Values.config.ethconnectTopic | quote }}
+      retry:
+        enable: {{ .Values.config.ethconnectRetry }}
       {{- if and .Values.config.ethconnectUsername .Values.config.ethconnectPassword }}
       auth:
         username: {{ .Values.config.ethconnectUsername | quote }}
@@ -131,6 +133,23 @@ blockchain:
       {{- if .Values.config.ethconnectPrefixLong }}
       prefixLong: {{ .Values.config.ethconnectPrefixLong }}
       {{- end }}
+{{- else if .Values.config.fabconnectUrl }}
+blockchain:
+  type: fabric
+  fabric:
+    fabconnect:
+      url: {{ tpl .Values.config.fabconnectUrl . }}
+      {{- if and .Values.config.fabconnectUsername .Values.config.fabconnectPassword }}
+      auth:
+        username: {{ .Values.config.fabconnectUsername | quote }}
+        password: {{ .Values.config.fabconnectPassword | quote }}
+      {{- end }}
+      retry:
+        enable: {{ .Values.config.fabconnectRetry }}
+      channel: {{ .Values.config.fabconnectChannel | quote }}
+      chaincode: {{ .Values.config.fireflyChaincode | quote }}
+      topic: {{ .Values.config.fabconnectTopic | quote }}
+      signer: {{ .Values.config.fabconnectSigner | quote }}
 {{- end }}
 {{- if .Values.config.databaseOverride }}
 database:

deploy/charts/firefly/templates/_helpers.tpl

@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "firefly.coreLabels" . | nindent 4 }}
 stringData:
-  {{- if and .Values.config.postgresUrl .Values.config.postgresMigrationJob -}}
+  {{- if and .Values.config.postgresUrl .Values.config.postgresMigrationJob }}
   psql_url: {{ tpl .Values.config.postgresUrl . }}
   {{- end }}
   firefly.core: |

deploy/charts/firefly/templates/core/secret.yaml

@@ -19,12 +19,15 @@ config:
   # The name of the organization the FireFly node belongs to
   organizationName: ""
 
-  # The blockchain signing key of the organization e.g. the Ethereum account address
+  # The blockchain signing key of the organization e.g. the Ethereum account address or the Fabric membership
   organizationKey: ""
 
   # The Ethereum address of the pre-deployed FireFly smart contract
   fireflyContractAddress: "/instances/contractAddress"
 
+  # The name of the Fabric chaincode deployment for the FireFly chaincode
+  fireflyChaincode: firefly_go
+
   # The Postgres URL (including credentials and DB) for FireFly to for the database plugin
   postgresUrl: ""
 
@@ -67,12 +70,39 @@ config:
   # The basic auth password to use for authenticating to Ethconnect
   ethconnectPassword: ""
 
+  # Enables retries when communicating with Ethconnect
+  ethconnectRetry: true
+
+  # The Ethconnect topic to use for blockchain event subscriptions
+  ethconnectTopic: 0
+
   # The short prefix FireFly will prepend to certain headers it sends to Ethconnect i.e. ff or kld
   ethconnectPrefixShort: ""
 
   # The long prefix FireFly will prepend to certain headers it sends to Ethconnect i.e. FireFly or Kaleido
   ethconnectPrefixLong: ""
 
+  # The URL of the Fabconnect API and WS server to use for the blockchain plugin of type `fabric`
+  fabconnectUrl: ""
+
+  # The Fabric channel to use when communicating with peers and running chaincodes
+  fabconnectChannel: default-channel
+
+  # Enables retries when communicating with Fabconnect
+  fabconnectRetry: true
+
+  # The basic auth username to use for authenticating to Fabconnect
+  fabconnectUsername: ""
+
+  # The basic auth password to use for authenticating to Fabconnect
+  fabconnectPassword: ""
+
+  # The Fabconnect topic to use for blockchain event subscriptions
+  fabconnectTopic: 0
+
+  # The Fabric to use for signing transactions, must be pre-registered and enrolled
+  fabconnectSigner: ""
+
   # Whether to use a Job to perform auto-registration of the FireFly runtime.
   # Note registration will not be successful until the new node has caught up with the head of the chain.
   registrationJob: false