From 28d5ac6cf00b39fd8f1a77bff5fe134172e9dee9 Mon Sep 17 00:00:00 2001 From: Milan Roustan Date: Thu, 11 May 2023 17:00:03 +0200 Subject: [PATCH] chore: release 0.2.4 (#156) Signed-off-by: Milouu --- CHANGELOG.md | 2 + charts/hlf-k8s/CHANGELOG.md | 36 ++++++++++ charts/hlf-k8s/Chart.yaml | 2 +- charts/hlf-k8s/README.md | 2 +- charts/hlf-k8s/values.yaml | 138 +++++++++++++++++------------------- 5 files changed, 105 insertions(+), 75 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0096a7..f520bc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.2.4] - 2023-05-11 + ### Fixed - Update libcurl in fabric-tools image ([#151](https://github.com/Substra/hlf-k8s/pull/151)) diff --git a/charts/hlf-k8s/CHANGELOG.md b/charts/hlf-k8s/CHANGELOG.md index fabf9c2..0d19aaf 100644 --- a/charts/hlf-k8s/CHANGELOG.md +++ b/charts/hlf-k8s/CHANGELOG.md @@ -1,91 +1,123 @@ # Changelog +## 10.2.4 + +### Changed + +- Update image versions + ## 10.2.3 ### Changed + - Update image versions ## 10.2.2 ### Changed + - Update image versions ## 10.2.1 ### Changed + - Updated documentation ## 10.2.0 ### Changed + - Update default images to use public substra registry - Use `latest` tags of fabric-peer and fabric-tools ## 10.1.2 ### Changed + - Update chart metadata ## 10.1.1 ### Added + - Component annotation for chaincode pods ## 10.0.1 ### Removed + - Unused `users` values. ## 10.0.0 ### Changed + - Use couchdb chart instead of hlf-couchdb ## 9.1.2 ### Changed + - Update chart's logo ## 9.1.1 ### Added + - Support for 1.19.x pre-releases ## 9.1.0 ### Added + - Support for chaincode init containers ## 9.0.0 ### Added + - Support for Kubernetes 1.22 ### Removed + - Support for Kubernetes versions inferior to 1.19 ## 8.0.0 + ### Added + - pullImageSecret on fabric-tools and chaincode images - Update `hlf-peer` chart to 3.2.0 ### Breaking changes + - add `hlf-peer.peer.couchdbSecret` to make the value explicit ## 7.1.0 + ### Changed + - Update HLF images to 2.4 + ### Removed + - Remove `fabric-ca-tools` dependency and replace it by `fabric-tools` ## 7.0.1 + ### Fixed + - The application channel operator doesn't misbehave anymore when a peer joins 2 channels with overlapping names ## 7.0.0 + ### Changed + - Charts using API v2 now, officially dropping support form Helm v2 + ### Removed + - Remove `nginx-ingress` dependency ## 6.2.2 @@ -93,7 +125,9 @@ - Reduce the delay between each "add organization" operation in the appchannel operator from 5 secs to 1 sec ## 6.2.1 + ### Fixed + - `jq` does not fail anymore on mspid containing a special character in the chaincode operator. - The condition to enter the chaincode commit process in the chaincode operator was always true, now we enter only if the chaincode is not already commited. @@ -114,11 +148,13 @@ ## 5.1.3 ### Fixed + - only approve chaincode once ## 5.1.1 ### Fixed + - moved `hlf-peer.docker.enabled` to `hlf-peer.peer.docker.enabled` to correctly disable docker socket mount. ## 5.0.0 diff --git a/charts/hlf-k8s/Chart.yaml b/charts/hlf-k8s/Chart.yaml index 7cef8e7..451ef87 100644 --- a/charts/hlf-k8s/Chart.yaml +++ b/charts/hlf-k8s/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 name: hlf-k8s description: Substra tools to configure the hyperledger fabric network type: application -version: 10.2.3 +version: 10.2.4 kubeVersion: ">= 1.19.0-0" home: https://github.com/Substra icon: https://avatars.githubusercontent.com/u/84009910?s=400 diff --git a/charts/hlf-k8s/README.md b/charts/hlf-k8s/README.md index e15ada3..f666656 100644 --- a/charts/hlf-k8s/README.md +++ b/charts/hlf-k8s/README.md @@ -91,7 +91,7 @@ The following table lists the configurable parameters of the hlf-k8s chart and d | `systemChannel.organizations` | The organizations to add to the system channel. See [Add an organization to the system channel](#add-an-organization-to-the-system-channel). | `[]` | | **Common / Other** | | | | `fabric-tools.image.repository` | `fabric-tools` image repository | `gcr.io/connect-314908/fabric-tools` | -| `fabric-tools.image.tag` | `fabric-tools` image tag | `0.2.3` | +| `fabric-tools.image.tag` | `fabric-tools` image tag | `0.2.4` | | `fabric-tools.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `fabric-tools.image.pullImageSecret` | Image pull secret name | nil | | `nodeSelector` | Node labels for pod assignment | `{}` | diff --git a/charts/hlf-k8s/values.yaml b/charts/hlf-k8s/values.yaml index 22691d3..32cd7c1 100644 --- a/charts/hlf-k8s/values.yaml +++ b/charts/hlf-k8s/values.yaml @@ -15,7 +15,7 @@ fabric-tools: image: repository: ghcr.io/substra/fabric-tools - tag: 0.2.3 + tag: 0.2.4 pullPolicy: IfNotPresent pullImageSecret: "" @@ -58,69 +58,68 @@ chaincodes: [] # repository: substra/substra-chaincode-init # tag: 0.3.0 - appChannels: -- channelName: mychannel - - ## The organizations to add to the application channel (see README) - organizations: [] - # - { org: Org1, mspid: Org1MSP, configUrl: peer-1-org-config-operator.org-1.svc.cluster.local/config/configOrgWithAnchors.json } - # - { org: Org2, mspid: Org2MSP, configUrl: peer-2-org-config-operator.org-2.svc.cluster.local/config/configOrgWithAnchors.json } - - ## The organizations to fetch signed proposals from (see README) - proposalOrganizations: [] - # - { org: Org1, mspid: Org1MSP, proposalServerUrl: peer-1-org-appchannel-operator-mychannel.org-1.svc.cluster.local/proposal/ } - # - { org: Org2, mspid: Org2MSP, proposalServerUrl: peer-2-org-appchannel-operator-mychannel.org-2.svc.cluster.local/proposal/ } - - channelPolicies: |- - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "ANY Admins" - - appPolicies: |- - LifecycleEndorsement: - Type: ImplicitMeta - Rule: "ANY Endorsement" - Endorsement: - Type: ImplicitMeta - Rule: "MAJORITY Endorsement" - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - - chaincodes: [] - # - name: mycc - # policy: "OR('MyOrg1MSP.member','MyOrg2MSP.member')" - # version: "1.0" - # sequence: "1" - - ingress: - enabled: false - # ingressClassName: - # pathType: ImplementationSpecific - # annotations: - # cert-manager.io/cluster-issuer: letsencrypt-prod - # cert-manager.io/http01-edit-in-place: "true" - # nginx.ingress.kubernetes.io/client-body-buffer-size: 100m - # nginx.ingress.kubernetes.io/proxy-body-size: 100m - # tls: - # - secretName: config-server-tls-cert - # hosts: - # - peer-1-peer-appchannel-operator.org-1 - # hosts: - # - { host: peer-1-peer-appchannel-operator.org-1, paths: ["/mychannel/proposals"] } + - channelName: mychannel + + ## The organizations to add to the application channel (see README) + organizations: [] + # - { org: Org1, mspid: Org1MSP, configUrl: peer-1-org-config-operator.org-1.svc.cluster.local/config/configOrgWithAnchors.json } + # - { org: Org2, mspid: Org2MSP, configUrl: peer-2-org-config-operator.org-2.svc.cluster.local/config/configOrgWithAnchors.json } + + ## The organizations to fetch signed proposals from (see README) + proposalOrganizations: [] + # - { org: Org1, mspid: Org1MSP, proposalServerUrl: peer-1-org-appchannel-operator-mychannel.org-1.svc.cluster.local/proposal/ } + # - { org: Org2, mspid: Org2MSP, proposalServerUrl: peer-2-org-appchannel-operator-mychannel.org-2.svc.cluster.local/proposal/ } + + channelPolicies: |- + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "ANY Admins" + + appPolicies: |- + LifecycleEndorsement: + Type: ImplicitMeta + Rule: "ANY Endorsement" + Endorsement: + Type: ImplicitMeta + Rule: "MAJORITY Endorsement" + Readers: + Type: ImplicitMeta + Rule: "ANY Readers" + Writers: + Type: ImplicitMeta + Rule: "ANY Writers" + Admins: + Type: ImplicitMeta + Rule: "MAJORITY Admins" + + chaincodes: [] + # - name: mycc + # policy: "OR('MyOrg1MSP.member','MyOrg2MSP.member')" + # version: "1.0" + # sequence: "1" + + ingress: + enabled: false + # ingressClassName: + # pathType: ImplementationSpecific + # annotations: + # cert-manager.io/cluster-issuer: letsencrypt-prod + # cert-manager.io/http01-edit-in-place: "true" + # nginx.ingress.kubernetes.io/client-body-buffer-size: 100m + # nginx.ingress.kubernetes.io/proxy-body-size: 100m + # tls: + # - secretName: config-server-tls-cert + # hosts: + # - peer-1-peer-appchannel-operator.org-1 + # hosts: + # - { host: peer-1-peer-appchannel-operator.org-1, paths: ["/mychannel/proposals"] } configOperator: ingress: @@ -140,7 +139,6 @@ configOperator: # hosts: # - { host: peer-1-peer-config-operator.org-1, paths: ["/"] } - organization: id: MyOrganizationMSP name: MyOrganization @@ -183,8 +181,7 @@ hlf-ca: hlf-peer: peer: docker: - enabled: - false + enabled: false databaseType: CouchDB couchdbSecret: hlf-couchdb-credentials couchdbService: cdb-peer @@ -205,7 +202,7 @@ hlf-peer: image: # Use our own fabric-peer images with external chaincode binaries repository: ghcr.io/substra/fabric-peer - tag: 0.2.3 + tag: 0.2.4 pullImageSecret: "" persistence: enabled: true @@ -240,8 +237,6 @@ hlf-peer: ## This should include the Orderer TLS 'cacert.pem' ordTlsRootCert: ord-tls-rootcert - - couchdb: clusterSize: 1 service: @@ -259,7 +254,6 @@ couchdb: # Since version 3.0.0 setting the CouchDB server instance UUID is mandatory uuid: d3cefce1-8736-41ef-8468-27bf6cd035ec # should be replaced in production - hlf-ord: enabled: false host: orderer-hostname @@ -349,15 +343,13 @@ secrets: # This should include the Orderer TLS 'cacert.pem' ordTlsRootCert: ord-tls-rootcert - privateCa: enabled: false configMap: name: private-ca -# data: nil + # data: nil fileName: private-ca.crt - enrollments: creds: [] ## Orderer