diff --git a/stable/hlf-ord/.helmignore b/stable/hlf-ord/.helmignore index f0c1319444..902e3962bb 100644 --- a/stable/hlf-ord/.helmignore +++ b/stable/hlf-ord/.helmignore @@ -19,3 +19,6 @@ .project .idea/ *.tmproj + +# OWNERS file for Helm repository +OWNERS diff --git a/stable/hlf-ord/Chart.yaml b/stable/hlf-ord/Chart.yaml index 351b0b2a71..36af622acb 100644 --- a/stable/hlf-ord/Chart.yaml +++ b/stable/hlf-ord/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Hyperledger Fabric Orderer chart (these charts are created by AID:Tech and are currently not directly associated with the Hyperledger project) name: hlf-ord -version: 1.0.8 +version: 1.0.10 appVersion: 1.1.0 keywords: - blockchain @@ -15,5 +15,4 @@ maintainers: email: sasha@aid.technology - name: nicolapaoli email: nicola@aid.technology -## Icon not included while sorting out trademark question with Hyperledger project -# icon: https://www.hyperledger.org/wp-content/uploads/2018/04/fabric-logo.png +icon: https://www.hyperledger.org/wp-content/uploads/2018/04/fabric-logo.png diff --git a/stable/hlf-ord/OWNERS b/stable/hlf-ord/OWNERS new file mode 100644 index 0000000000..a25be9b46e --- /dev/null +++ b/stable/hlf-ord/OWNERS @@ -0,0 +1,6 @@ +approvers: +- alexvicegrab +- nicolapaoli +reviewers: +- alexvicegrab +- nicolapaoli diff --git a/stable/hlf-ord/README.md b/stable/hlf-ord/README.md index 5c31bed019..2b55e1b9f0 100644 --- a/stable/hlf-ord/README.md +++ b/stable/hlf-ord/README.md @@ -97,6 +97,7 @@ The following table lists the configurable parameters of the Hyperledger Fabric | `caAddress` | Address of CA to register/enroll with | `hlf-ca.local` | | `caUsername` | Username for registering/enrolling with CA | `ord1` | | `caPassword` | Password for registering/enrolling with CA | Random 24 alphanumeric characters | +| `ord.hlfToolsVersion` | Version of Hyperledger Fabric tools used | `1.1.0` | | `ord.type` | Type of Orderer (`solo` or `kafka`) | `solo` | | `ord.mspID` | ID of MSP the Orderer belongs to | `OrdererMSP` | | `secrets.genesis` | Secret containing Genesis Block for orderer | `hlf--genesis` | diff --git a/stable/hlf-ord/templates/configmap--ord.yaml b/stable/hlf-ord/templates/configmap--ord.yaml index 6c66923fc6..ce5fb559df 100644 --- a/stable/hlf-ord/templates/configmap--ord.yaml +++ b/stable/hlf-ord/templates/configmap--ord.yaml @@ -6,7 +6,7 @@ metadata: {{ include "labels.standard" . | indent 4 }} data: ## Environmental variable defining which version of tools to obtain (for fabric-ca-client) - HLF_TOOLS_BUILD: linux-amd64-1.1.0 + HLF_TOOLS_BUILD: linux-amd64-{{ .Values.ord.hlfToolsVersion }} ## Location where fabric-ca-client configuration is saved FABRIC_CA_CLIENT_HOME: /var/hyperledger/fabric-ca-client ## Orderer defaults diff --git a/stable/hlf-ord/templates/deployment.yaml b/stable/hlf-ord/templates/deployment.yaml index a866281292..5456b202ea 100644 --- a/stable/hlf-ord/templates/deployment.yaml +++ b/stable/hlf-ord/templates/deployment.yaml @@ -42,6 +42,19 @@ spec: - sh - -c - | + + while [ ! -d /hl_config/admin/admincerts ] || [ -z "$(ls -A /hl_config/admin/admincerts)" ]; + do + echo "\033[0;31m /hl_config/admin/admincerts must contain Ord admin certificates files \033[0m" + sleep 60 + done + + while [ ! -d /hl_config/genesis ] || [ -z "$(ls -A /hl_config/genesis)" ]; + do + echo "\033[0;31m /hl_config/genesis must contain Genesis transaction \033[0m" + sleep 60 + done + # Download Fabric CA-client if it does not exist if [ ! -f /bin/fabric-ca-client ] then diff --git a/stable/hlf-ord/templates/pvc.yaml b/stable/hlf-ord/templates/pvc.yaml index b1592c3dfe..7f38850fe0 100644 --- a/stable/hlf-ord/templates/pvc.yaml +++ b/stable/hlf-ord/templates/pvc.yaml @@ -16,6 +16,10 @@ spec: requests: storage: {{ .Values.persistence.size | quote }} {{- if .Values.persistence.storageClass }} - storageClassName: {{ .Values.persistence.storageClass | quote }} + {{- if (eq "-" .Values.persistence.storageClass) }} + storageClassName: "" + {{- else }} + storageClassName: "{{ .Values.persistence.storageClass }}" + {{- end }} {{- end }} {{- end }} diff --git a/stable/hlf-ord/values.yaml b/stable/hlf-ord/values.yaml index 567e865a3a..689933b576 100644 --- a/stable/hlf-ord/values.yaml +++ b/stable/hlf-ord/values.yaml @@ -15,7 +15,12 @@ service: persistence: enabled: true annotations: {} - ## If unset or "", use "default" storage class. + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## storageClass: "" accessMode: ReadWriteOnce size: 1Gi @@ -32,18 +37,20 @@ caUsername: ord1 # caPassword: ord: + # Tools version + hlfToolsVersion: 1.1.0 ## Type of Orderer, `solo` or `kafka` type: solo ## MSP ID of the Orderer mspID: OrdererMSP -secrets: +secrets: {} ## This should contain "genesis" block derived from a configtx.yaml ## configtxgen -profile OrdererGenesis -outputBlock genesis.block - genesis: hlf--genesis + # genesis: hlf--genesis ## This should contain the Certificate of the Orderer Organisation admin ## This is necessary to successfully run the orderer - adminCert: hlf--ord-admincert + # adminCert: hlf--ord-admincert resources: {} ## We usually recommend not to specify default resources and to leave this as a conscious