Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: prep charts for FireFly 1.3 #1

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: setup kind
uses: engineerd/[email protected]
with:
version: v0.11.1
version: v0.20.0

- name: install k8s deps
run: make deps
Expand Down
4 changes: 2 additions & 2 deletions charts/firefly-evmconnect/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/firefly-evmconnect/templates/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly-evmconnect/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly-evmconnect/templates/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
8 changes: 4 additions & 4 deletions charts/firefly/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright © 2022 Kaleido, Inc.
# Copyright © 2024 Kaleido, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
Expand All @@ -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
Expand All @@ -39,4 +39,4 @@ dependencies:
repository: "file://../firefly-evmconnect"
alias: evmconnect
condition: evmconnect.enabled
version: "0.6.0"
version: "0.7.0"
72 changes: 37 additions & 35 deletions charts/firefly/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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._
Expand All @@ -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._
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
// ...
}
```
2 changes: 1 addition & 1 deletion charts/firefly/scripts/ff-db-migrations.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

# Copyright © 2022 Kaleido, Inc.
# Copyright © 2024 Kaleido, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

// Copyright © 2022 Kaleido, Inc.
// Copyright © 2024 Kaleido, Inc.
//
// SPDX-License-Identifier: Apache-2.0
//
Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/scripts/ff-register-contracts.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright © 2022 Kaleido, Inc.
# Copyright © 2024 Kaleido, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/scripts/ff-registration.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

# Copyright © 2022 Kaleido, Inc.
# Copyright © 2024 Kaleido, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/core/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/core/job-migrations.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/core/job-registration.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/core/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/core/service.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/core/servicemonitor.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/core/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/dataexchange/certificate.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/dataexchange/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/dataexchange/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/dataexchange/service.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/dataexchange/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/erc1155/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/erc1155/service.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/erc20erc721/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/erc20erc721/service.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/ethconnect/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/ethconnect/secret.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/ethconnect/service.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/ethconnect/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/sandbox/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
2 changes: 1 addition & 1 deletion charts/firefly/templates/sandbox/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{/*
Copyright © 2022 Kaleido, Inc.
Copyright © 2024 Kaleido, Inc.

SPDX-License-Identifier: Apache-2.0

Expand Down
Loading
Loading