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.

Sign up for GitHub

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

[fabric] Custom container registry support #2403

Merged
merged 2 commits into from
Nov 7, 2023
Merged

[fabric] Custom container registry support #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23af1a4
[fabric] Custom container registry support
mgCepeda Oct 30, 2023
13347a0
Merge branch 'develop' into bug-2386v2
sownak Nov 6, 2023
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 platforms/hyperledger-fabric/charts/anchorpeer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/anchorpeer/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/approve_chaincode/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/approve_chaincode/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/ca/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/ca/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions platforms/hyperledger-fabric/charts/catools/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/catools/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions platforms/hyperledger-fabric/charts/catools/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/commit_chaincode/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/commit_chaincode/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/create_channel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/create_channel/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/fabric_cli/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/fabric_cli/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion platforms/hyperledger-fabric/charts/generate_cacerts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |

Expand Down
3 changes: 0 additions & 3 deletions platforms/hyperledger-fabric/charts/generate_cacerts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/install_chaincode/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/install_chaincode/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/install_external_chaincode/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/install_external_chaincode/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/instantiate_chaincode/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |

Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/instantiate_chaincode/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/invoke_chaincode/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | "" |
Expand Down
2 changes: 1 addition & 1 deletion platforms/hyperledger-fabric/charts/invoke_chaincode/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading