Skip to content

Commit

Permalink
[fabric] Custom container registry support (#2403)
Browse files Browse the repository at this point in the history
Primary Changes
--------------
 1. All tpl have been modified so that all images are under the same registry
 2. All image references in the roles have been removed
 3. Fixed an error that occurs in Fabric deployment 1.4.8
 4. The values.yaml and readme files have been updated with the new values of the images

fixes #2386

Signed-off-by: mgCepeda <[email protected]>
mgCepeda authored Nov 7, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent eab1d4d commit efc455f
Showing 135 changed files with 145 additions and 284 deletions.
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/anchorpeer/README.md
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| Name | Description | Default Value |
| ----------------------| ----------------------------------------------------------------------------------| --------------------------------------------------|
| namespace | Provide the namespace for organization's peer | org1-net |
| images.fabrictools | Provide the valid image name and version | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Provide the valid image name and version | ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Provide the valid image name and version to read certificates from vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Provide the custom labels | "" |

2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/anchorpeer/values.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabric-tools: hyperledger/fabrictools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg.alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| Name | Description | Default Value |
| ----------------------| ----------------------------------------------------------------------------------| -------------------------------------------------|
| namespace | Provide the namespace for organization's peer | org1-net |
| images.fabrictools | Provide the valid image name and version | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Provide the valid image name and version | ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Provide the valid image name and version to read certificates from vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Provide the custom labels | "" |

Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg. alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/ca/README.md
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| Name | Description | Default Value |
| ----------------------| -----------------------------------------------------------------| --------------------------------------------------|
| namespace | Namespace for CA server | org1-net |
| images.ca | image name and version for fabric ca | hyperledger/fabric-ca:1.4.8 |
| images.ca | image name and version for fabric ca | ghcr.io/hyperledger/bevel-fabric-ca:1.4.8 |
| images.alpineutils | image name and version to read certificates from vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Provide the custom labels | "" |

2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/ca/values.yaml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ metadata:
images:
#Provide the valid image name and version for fabric ca
#Eg. ca: hyperledger/fabric-ca:1.4.8
ca: hyperledger/fabric-ca:1.4.8
ca: ghcr.io/hyperledger/bevel-fabric-ca:1.4.8
#Provide the valid image name and version to read certificates from vault server
#Eg.alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
3 changes: 1 addition & 2 deletions platforms/hyperledger-fabric/charts/catools/README.md
Original file line number Diff line number Diff line change
@@ -87,8 +87,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy

| Name | Description | Default Value |
| --------------| ------------------------------------------------------------------------| ----------------------------------------------------|
| repository | Image name for the server container | hyperledger/fabric-ca-tools |
| tag | Image tag for the server container | 1.3.0 |
| repository | Image name for the server container | ghcr.io/hyperledger/bevel-fabric-ca-tools:1.2.1 |
| pullPolicy | Image pull policy | IfNotPresent |
| alpineutils | Valid image name and version to read certificates from the vault server | ghcr.io/hyperledger/bevel-alpine:latest |

Original file line number Diff line number Diff line change
@@ -346,7 +346,7 @@ spec:
subPath: bevel-vault.sh
containers:
- name: {{ .Values.metadata.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.image.catools }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: COMPONENT_TYPE
5 changes: 1 addition & 4 deletions platforms/hyperledger-fabric/charts/catools/values.yaml
Original file line number Diff line number Diff line change
@@ -26,10 +26,7 @@ replicaCount: 1
image:
#Provide the image name for the server container
#Eg. image: hyperledger/fabric-ca-tools
repository: hyperledger/fabric-ca-tools
#Provide the image tag for the server container
#Eg. imagetag: 1.3.0
tag: 1.3.0
repository: ghcr.io/hyperledger/bevel-fabric-ca-tools:1.2.1
# Provide image pull policy
pullPolicy: IfNotPresent
#Provide the valid image name and version to read certificates from vault server
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| Name | Description | Default Value |
| ----------------------| --------------------------------------------------| --------------------------------------------------|
| namespace | Namespace for organization's peer | org1-net |
| images.fabrictools | Image name and version for fabric tools | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Image name and version for fabric tools |ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Image name and version to read certificates | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Custom labels (if applicable) | "" |

Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg. alpineutils: gcr.io/acn-stp-on-blockchain/alpine-utils
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| Name | Description | Default Value |
| ----------------------| ----------------------------------------------------------------------|---------------------------------------------------|
| namespace | Provide the namespace for organization's peer | org1-net |
| images.fabrictools | Valid image name and version for fabric tools | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Valid image name and version for fabric tools | ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Valid image name and version to read certificates from vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Custom labels (other than specified) | "" |

Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg. alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/fabric_cli/README.md
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| Name | Description | Default Value |
| ----------------------| ----------------------------------------------------------------------| --------------------------------------------------|
| namespace | Namespace for organization's peer deployment | org1-net |
| images.fabrictools | Valid image name and version for fabric tools | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Valid image name and version for fabric tools |ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Valid image name and version to read certificates from vault server | ghcr.io/hyperledger/bevel-alpine:latest |

### Storage
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/fabric_cli/values.yaml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg.alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Original file line number Diff line number Diff line change
@@ -70,7 +70,6 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| namespace | Namespace for the organization's peer | org1-net |
| name | Organization's name | org1 |
| component_name | Organization's component name | org1-net |
| images.fabrictools | Valid image name and version for fabric tools | hyperledger/fabrictools:1.4.0 |
| images.alpineutils | Valid image name and version to read certificates from the vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Custom labels for the organization | "" |

Original file line number Diff line number Diff line change
@@ -15,9 +15,6 @@ metadata:
#Eg. namespace: org1-net
namespace: org1-net
images:
#Provide the valid image name and version for fabric tools
#Eg. fabric-tools: hyperledger/fabrictools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg.alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| ---------------- | -------------------------------------------------------------------------| --------------------------------------------------|
| network.version | HyperLedger Fabric network version | 2.2.2 |
| namespace | Namespace for organization's peer | org1-net |
| images.fabrictools | Valid image name and version for Fabric tools | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Valid image name and version for Fabric tools | ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Valid image name and version to read certificates from the Vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Custom labels for the organization | "" |

Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg.alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| -----------------------| -------------------------------------------------------------------------| --------------------------------------------------|
| network.version | HyperLedger Fabric network version | 2.2.2 |
| namespace | Namespace for organization's peer | org1-net |
| images.fabrictools | Valid image name and version for Fabric tools | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Valid image name and version for Fabric tools |ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Valid image name and version to read certificates from the Vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Custom labels for the organization | "" |

Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg.alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| Name | Description | Default Value |
|------------------------|--------------------------------------------------------------------------| --------------------------------------------------|
| namespace | Namespace for organization's peer | org1-net |
| images.fabrictools | Valid image name and version for Fabric tools | hyperledger/fabric-tools:2.2.2 |
| images.fabrictools | Valid image name and version for Fabric tools | ghcr.io/hyperledger/bevel-fabric-tools:1.4.8 |
| images.alpineutils | Valid image name and version to read certificates from the Vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| labels | Custom labels for the organization | "" |

Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:1.4.8
#Provide the valid image name and version to read certificates from vault server
#Eg. alpineutils: gcr.io/acn-stp-on-blockchain/alpine-utils
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
| -----------------------| ---------------------------------------------------------------------------------| --------------------------------------------------|
| namespace | Namespace for organization's peer | org1-net |
| network.version | HyperLedger Fabric network version | 2.2.2 |
| images.fabrictools | Valid image name and version for Fabric tools | hyperledger/fabric-tools:1.4.0 |
| images.fabrictools | Valid image name and version for Fabric tools | ghcr.io/hyperledger/bevel-fabric-tools:2.2.2 |
| images.alpineutils | Valid image name and version to read certificates from the Vault server | ghcr.io/hyperledger/bevel-alpine:latest |
| add_organization | Flag for ivoking the chaincode for addition of an org or for the first network | false |
| labels | Custom labels for the organization | "" |
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ metadata:
images:
#Provide the valid image name and version for fabric tools
#Eg. fabrictools: hyperledger/fabric-tools:1.4.0
fabrictools: hyperledger/fabric-tools:2.2.2
fabrictools: ghcr.io/hyperledger/bevel-fabric-tools:2.2.2
#Provide the valid image name and version to read certificates from vault server
#Eg. alpineutils: gcr.io/acn-stp-on-blockchain/alpine-utils
alpineutils: ghcr.io/hyperledger/bevel-alpine:latest
Loading

0 comments on commit efc455f

Please sign in to comment.