diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index e6cde69..9dd3b49 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -39,7 +39,7 @@ jobs: - name: setup kind uses: engineerd/setup-kind@v0.5.0 with: - version: v0.11.1 + version: v0.20.0 - name: install k8s deps run: make deps diff --git a/charts/firefly-evmconnect/Chart.yaml b/charts/firefly-evmconnect/Chart.yaml index 3dc40a2..db41e4f 100644 --- a/charts/firefly-evmconnect/Chart.yaml +++ b/charts/firefly-evmconnect/Chart.yaml @@ -5,8 +5,8 @@ description: | Requires a running instance of FireFly and a persistent volume for managing its transaction state. type: application -version: 0.6.0 -appVersion: "0.1.2" +version: 0.7.0 +appVersion: "0.1.3" maintainers: - name: hfuss diff --git a/charts/firefly-evmconnect/templates/secret.yaml b/charts/firefly-evmconnect/templates/secret.yaml index 409014e..6607faf 100644 --- a/charts/firefly-evmconnect/templates/secret.yaml +++ b/charts/firefly-evmconnect/templates/secret.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly-evmconnect/templates/service.yaml b/charts/firefly-evmconnect/templates/service.yaml index aaaff24..2ae94da 100644 --- a/charts/firefly-evmconnect/templates/service.yaml +++ b/charts/firefly-evmconnect/templates/service.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly-evmconnect/templates/statefulset.yaml b/charts/firefly-evmconnect/templates/statefulset.yaml index aa27638..22189c0 100644 --- a/charts/firefly-evmconnect/templates/statefulset.yaml +++ b/charts/firefly-evmconnect/templates/statefulset.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/Chart.yaml b/charts/firefly/Chart.yaml index 8729b65..e990802 100644 --- a/charts/firefly/Chart.yaml +++ b/charts/firefly/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright © 2022 Kaleido, Inc. +# Copyright © 2024 Kaleido, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -21,8 +21,8 @@ description: | By default allows the user to deploy FireFly with a single multi-party namespace, with the ability to template additional multi-party or gateway namespaces. type: application -appVersion: "1.1.0" -version: "0.6.0" +appVersion: "1.3.0" +version: "0.7.0" maintainers: - name: hfuss @@ -39,4 +39,4 @@ dependencies: repository: "file://../firefly-evmconnect" alias: evmconnect condition: evmconnect.enabled - version: "0.6.0" + version: "0.7.0" diff --git a/charts/firefly/README.md b/charts/firefly/README.md index 7d4550f..6afb64c 100644 --- a/charts/firefly/README.md +++ b/charts/firefly/README.md @@ -8,36 +8,38 @@ package manager. It can be used to deploy a single FireFly node for an individua ### Table of Contents -* [Prerequisites](#prerequisites) -* [Get Repo Info](#get-repo-info) -* [Install Chart](#install-chart) -* [Uninstall Chart](#uninstall-chart) -* [Upgrading Chart](#upgrading-chart) -* [Using as a Dependency](#using-as-a-dependency) -* [Deployment Architecture](#deployment-architecture) -* [Configuration](#configuration) - * [Configuration File Templating](#configuration-file-templating) - * [Additional Environment Variables](#additional-environment-variables) - * [Ethereum](#ethereum) - * [Remote Ethconnect](#remote-ethconnect) - * [Chart-managed Ethconnect](#chart-managed-ethconnect) - * [Smart Contract Deployment](#smart-contract-deployment) - * [Fabric](#fabric) - * [Chaincode](#chaincode) - * [Identity Management](#identity-management) - * [Ingress Example](#ingress-example) - * [Database Migrations](#database-migrations) - * [Auto-Registration](#auto-registration) - * [DataExchange HTTPS and cert-manager](#dataexchange-https-and-cert-manager) - * [Tokens Connectors](#tokens-connectors) - * [ERC1155](#erc1155) - * [ERC20 / ERC721](#erc20--erc721) - * [Prometheus Support](#prometheus-support) -* [Automated Deployments](#automated-deployments) - * [GitOps](#gitops) - * [Flux V2](#flux-v2) - * [ArgoCD](#argocd) - * [Terraform](#terraform) +- [FireFly](#firefly) + - [Table of Contents](#table-of-contents) + - [Prerequisites](#prerequisites) + - [Get Repo Info](#get-repo-info) + - [Install Chart](#install-chart) + - [Uninstall Chart](#uninstall-chart) + - [Upgrading Chart](#upgrading-chart) + - [Using as a Dependency](#using-as-a-dependency) + - [Deployment Architecture](#deployment-architecture) + - [Configuration](#configuration) + - [Configuration File Templating](#configuration-file-templating) + - [Additional Environment Variables](#additional-environment-variables) + - [Ethereum](#ethereum) + - [Remote Ethconnect](#remote-ethconnect) + - [Chart-managed Ethconnect](#chart-managed-ethconnect) + - [Smart Contract Deployment](#smart-contract-deployment) + - [Fabric](#fabric) + - [Chaincode](#chaincode) + - [Identity Management](#identity-management) + - [Ingress Example](#ingress-example) + - [Database Migrations](#database-migrations) + - [Auto-Registration](#auto-registration) + - [DataExchange HTTPS and cert-manager](#dataexchange-https-and-cert-manager) + - [Tokens Connectors](#tokens-connectors) + - [ERC1155](#erc1155) + - [ERC20 / ERC721](#erc20--erc721) + - [Prometheus Support](#prometheus-support) + - [Automated Deployments](#automated-deployments) + - [GitOps](#gitops) + - [Flux V2](#flux-v2) + - [ArgoCD](#argocd) + - [Terraform](#terraform) ## Prerequisites @@ -64,7 +66,7 @@ helm registry login ghcr.io ## Install Chart ```shell -helm install [RELEASE_NAME] --version 0.6.0 oci://ghcr.io/hyperledger/helm/firefly +helm install [RELEASE_NAME] --version 0.7.0 oci://ghcr.io/hyperledger/helm/firefly ``` _See [configuration](#Configuration) below._ @@ -82,7 +84,7 @@ _See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command doc ## Upgrading Chart ```shell -helm upgrade [RELEASE_NAME] --install --version 0.6.0 oci://ghcr.io/hyperledger/helm/firefly +helm upgrade [RELEASE_NAME] --install --version 0.7.0 oci://ghcr.io/hyperledger/helm/firefly ``` _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ @@ -96,7 +98,7 @@ dependencies: # ... - name: firefly repository: "oci://ghcr.io/hyperledger/helm/" - version: 0.6.0 + version: 0.7.0 ``` Then download the chart dependency into your parent chart: @@ -637,7 +639,7 @@ spec: interval: 10m url: "https://github.com/hyperledger/firefly-helm-charts" ref: - tag: v0.6.0 + tag: v0.7.0 ignore: | /* !/charts/firefly @@ -694,7 +696,7 @@ As a result, you can configure Terraform to use the FireFly chart by either: ```hcl resource "helm_release" "firefly" { name = "firefly" - chart = "firefly-0.6.0.tgz" + chart = "firefly-0.7.0.tgz" // ... } ``` \ No newline at end of file diff --git a/charts/firefly/scripts/ff-db-migrations.sh b/charts/firefly/scripts/ff-db-migrations.sh index 73c10a0..09080a1 100644 --- a/charts/firefly/scripts/ff-db-migrations.sh +++ b/charts/firefly/scripts/ff-db-migrations.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright © 2022 Kaleido, Inc. +# Copyright © 2024 Kaleido, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/charts/firefly/scripts/ff-deploy-erc20-erc721-contracts/index.js b/charts/firefly/scripts/ff-deploy-erc20-erc721-contracts/index.js index 6f5ee56..2df7263 100644 --- a/charts/firefly/scripts/ff-deploy-erc20-erc721-contracts/index.js +++ b/charts/firefly/scripts/ff-deploy-erc20-erc721-contracts/index.js @@ -1,6 +1,6 @@ 'use strict'; -// Copyright © 2022 Kaleido, Inc. +// Copyright © 2024 Kaleido, Inc. // // SPDX-License-Identifier: Apache-2.0 // diff --git a/charts/firefly/scripts/ff-register-contracts.sh b/charts/firefly/scripts/ff-register-contracts.sh index c2ba6d2..9531cec 100644 --- a/charts/firefly/scripts/ff-register-contracts.sh +++ b/charts/firefly/scripts/ff-register-contracts.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright © 2022 Kaleido, Inc. +# Copyright © 2024 Kaleido, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/charts/firefly/scripts/ff-registration.sh b/charts/firefly/scripts/ff-registration.sh index 0b7562f..edf12bb 100644 --- a/charts/firefly/scripts/ff-registration.sh +++ b/charts/firefly/scripts/ff-registration.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright © 2022 Kaleido, Inc. +# Copyright © 2024 Kaleido, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/charts/firefly/templates/_helpers.tpl b/charts/firefly/templates/_helpers.tpl index d68dd13..e74509e 100644 --- a/charts/firefly/templates/_helpers.tpl +++ b/charts/firefly/templates/_helpers.tpl @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/core/ingress.yaml b/charts/firefly/templates/core/ingress.yaml index 21b6835..3d25d3f 100644 --- a/charts/firefly/templates/core/ingress.yaml +++ b/charts/firefly/templates/core/ingress.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/core/job-migrations.yaml b/charts/firefly/templates/core/job-migrations.yaml index 6257d33..6b32640 100644 --- a/charts/firefly/templates/core/job-migrations.yaml +++ b/charts/firefly/templates/core/job-migrations.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/core/job-registration.yaml b/charts/firefly/templates/core/job-registration.yaml index 4452d62..7d779a4 100644 --- a/charts/firefly/templates/core/job-registration.yaml +++ b/charts/firefly/templates/core/job-registration.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/core/secret.yaml b/charts/firefly/templates/core/secret.yaml index 0000a43..63456ad 100644 --- a/charts/firefly/templates/core/secret.yaml +++ b/charts/firefly/templates/core/secret.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/core/service.yaml b/charts/firefly/templates/core/service.yaml index 13b0227..68341bd 100644 --- a/charts/firefly/templates/core/service.yaml +++ b/charts/firefly/templates/core/service.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/core/servicemonitor.yaml b/charts/firefly/templates/core/servicemonitor.yaml index 117ba8a..92c164c 100644 --- a/charts/firefly/templates/core/servicemonitor.yaml +++ b/charts/firefly/templates/core/servicemonitor.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/core/statefulset.yaml b/charts/firefly/templates/core/statefulset.yaml index c072d74..c78c54f 100644 --- a/charts/firefly/templates/core/statefulset.yaml +++ b/charts/firefly/templates/core/statefulset.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/dataexchange/certificate.yaml b/charts/firefly/templates/dataexchange/certificate.yaml index 5a5afa9..1ac967c 100644 --- a/charts/firefly/templates/dataexchange/certificate.yaml +++ b/charts/firefly/templates/dataexchange/certificate.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/dataexchange/ingress.yaml b/charts/firefly/templates/dataexchange/ingress.yaml index 5e09744..a91a6ae 100644 --- a/charts/firefly/templates/dataexchange/ingress.yaml +++ b/charts/firefly/templates/dataexchange/ingress.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/dataexchange/secret.yaml b/charts/firefly/templates/dataexchange/secret.yaml index afbbecb..80292c6 100644 --- a/charts/firefly/templates/dataexchange/secret.yaml +++ b/charts/firefly/templates/dataexchange/secret.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/dataexchange/service.yaml b/charts/firefly/templates/dataexchange/service.yaml index e400d02..91aa5bb 100644 --- a/charts/firefly/templates/dataexchange/service.yaml +++ b/charts/firefly/templates/dataexchange/service.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/dataexchange/statefulset.yaml b/charts/firefly/templates/dataexchange/statefulset.yaml index 79c5032..3fac6c3 100644 --- a/charts/firefly/templates/dataexchange/statefulset.yaml +++ b/charts/firefly/templates/dataexchange/statefulset.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/erc1155/deployment.yaml b/charts/firefly/templates/erc1155/deployment.yaml index f3e61fb..f787471 100644 --- a/charts/firefly/templates/erc1155/deployment.yaml +++ b/charts/firefly/templates/erc1155/deployment.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/erc1155/service.yaml b/charts/firefly/templates/erc1155/service.yaml index 11cabf2..d847c72 100644 --- a/charts/firefly/templates/erc1155/service.yaml +++ b/charts/firefly/templates/erc1155/service.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/erc20erc721/configmap-deploy-scripts.yaml b/charts/firefly/templates/erc20erc721/configmap-deploy-scripts.yaml index 800d251..8695f6e 100644 --- a/charts/firefly/templates/erc20erc721/configmap-deploy-scripts.yaml +++ b/charts/firefly/templates/erc20erc721/configmap-deploy-scripts.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/erc20erc721/deployment.yaml b/charts/firefly/templates/erc20erc721/deployment.yaml index 4783d3e..4ad2dab 100644 --- a/charts/firefly/templates/erc20erc721/deployment.yaml +++ b/charts/firefly/templates/erc20erc721/deployment.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/erc20erc721/job-deploy-contracts.yaml b/charts/firefly/templates/erc20erc721/job-deploy-contracts.yaml index c964b45..d0accd1 100644 --- a/charts/firefly/templates/erc20erc721/job-deploy-contracts.yaml +++ b/charts/firefly/templates/erc20erc721/job-deploy-contracts.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/erc20erc721/service.yaml b/charts/firefly/templates/erc20erc721/service.yaml index dcad585..8171e5d 100644 --- a/charts/firefly/templates/erc20erc721/service.yaml +++ b/charts/firefly/templates/erc20erc721/service.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/ethconnect/configmap-contracts.yaml b/charts/firefly/templates/ethconnect/configmap-contracts.yaml index 08d07cd..ff1985c 100644 --- a/charts/firefly/templates/ethconnect/configmap-contracts.yaml +++ b/charts/firefly/templates/ethconnect/configmap-contracts.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/ethconnect/ingress.yaml b/charts/firefly/templates/ethconnect/ingress.yaml index fdf0f3e..fa9e68a 100644 --- a/charts/firefly/templates/ethconnect/ingress.yaml +++ b/charts/firefly/templates/ethconnect/ingress.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/ethconnect/job-register-contracts.yaml b/charts/firefly/templates/ethconnect/job-register-contracts.yaml index e77560c..ec2d485 100644 --- a/charts/firefly/templates/ethconnect/job-register-contracts.yaml +++ b/charts/firefly/templates/ethconnect/job-register-contracts.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/ethconnect/secret.yaml b/charts/firefly/templates/ethconnect/secret.yaml index dfbde6e..f3d54a9 100644 --- a/charts/firefly/templates/ethconnect/secret.yaml +++ b/charts/firefly/templates/ethconnect/secret.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/ethconnect/service.yaml b/charts/firefly/templates/ethconnect/service.yaml index 9c46e14..3bdf7a8 100644 --- a/charts/firefly/templates/ethconnect/service.yaml +++ b/charts/firefly/templates/ethconnect/service.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/ethconnect/statefulset.yaml b/charts/firefly/templates/ethconnect/statefulset.yaml index bc0ca0c..1e02424 100644 --- a/charts/firefly/templates/ethconnect/statefulset.yaml +++ b/charts/firefly/templates/ethconnect/statefulset.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/sandbox/deployment.yaml b/charts/firefly/templates/sandbox/deployment.yaml index 535a6a1..5d1c51d 100644 --- a/charts/firefly/templates/sandbox/deployment.yaml +++ b/charts/firefly/templates/sandbox/deployment.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/sandbox/ingress.yaml b/charts/firefly/templates/sandbox/ingress.yaml index b15fb0e..6fcb5f9 100644 --- a/charts/firefly/templates/sandbox/ingress.yaml +++ b/charts/firefly/templates/sandbox/ingress.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/templates/sandbox/service.yaml b/charts/firefly/templates/sandbox/service.yaml index 2d0aef5..fc82f37 100644 --- a/charts/firefly/templates/sandbox/service.yaml +++ b/charts/firefly/templates/sandbox/service.yaml @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0 diff --git a/charts/firefly/values.yaml b/charts/firefly/values.yaml index a504aff..14c8871 100644 --- a/charts/firefly/values.yaml +++ b/charts/firefly/values.yaml @@ -1,4 +1,4 @@ -# Copyright © 2022 Kaleido, Inc. +# Copyright © 2024 Kaleido, Inc. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/charts/license.tpl b/charts/license.tpl index e10450c..d7e8774 100644 --- a/charts/license.tpl +++ b/charts/license.tpl @@ -1,5 +1,5 @@ {{/* - Copyright © 2022 Kaleido, Inc. + Copyright © 2024 Kaleido, Inc. SPDX-License-Identifier: Apache-2.0