(fix): Errors related to duplicate use of ansible var 'register'

Dockerfile

@@ -63,14 +63,19 @@ RUN (set -x; cd "$(mktemp -d)" && \
     tar zxvf "${KREW}.tar.gz" && \
     ./"${KREW}" install krew)
 
+# Create local user ubuntu
+ARG USER_ID=1000
+ARG GROUP_ID=1000
+RUN groupadd -g ${GROUP_ID} ubuntu \
+ && useradd -m -u ${USER_ID} -g ubuntu -s /bin/bash ubuntu
 # Copy the provisional script to build container
 COPY ./run.sh /home
 COPY ./reset.sh /home
 RUN chmod 755 /home/run.sh
 RUN chmod 755 /home/reset.sh
 
 ENV JAVA_HOME=/home/jdk-14
-ENV PATH=~/.krew/bin:/home/jdk-14/bin:/root/bin:/root/.local/bin/:$PATH
+ENV PATH=~/.krew/bin:/home/jdk-14/bin:/root/bin:/root/.local/bin/:/home/ubuntu/bin:$PATH
 
 # The mounted repo should contain a build folder with the following files
 # 1) K8s config file as config
@@ -79,4 +84,5 @@ ENV PATH=~/.krew/bin:/home/jdk-14/bin:/root/bin:/root/.local/bin/:$PATH
 
 #path to mount the repo
 VOLUME /home/bevel/
+USER ubuntu
 CMD ["/home/run.sh"]

Dockerfile.jdk8

@@ -46,12 +46,17 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.27.0/b
 RUN chmod +x ./kubectl
 RUN mv ./kubectl /usr/local/bin
 
+# Create local user ubuntu
+ARG USER_ID=1000
+ARG GROUP_ID=1000
+RUN groupadd -g ${GROUP_ID} ubuntu \
+ && useradd -m -u ${USER_ID} -g ubuntu -s /bin/bash ubuntu
 # Copy the provisional script to build container
 COPY ./run.sh /home
 COPY ./reset.sh /home
 RUN chmod 755 /home/run.sh
 RUN chmod 755 /home/reset.sh
-ENV PATH=/root/bin:/root/.local/bin/:$PATH
+ENV PATH=/root/bin:/root/.local/bin/:/home/ubuntu/bin:$PATH
 
 # The mounted repo should contain a build folder with the following files
 # 1) K8s config file as config
@@ -60,4 +65,5 @@ ENV PATH=/root/bin:/root/.local/bin/:$PATH
 
 #path to mount the repo
 VOLUME /home/bevel/
+USER ubuntu
 CMD ["/home/run.sh"]

README.md

@@ -120,10 +120,16 @@ Please review [contributing](./CONTRIBUTING.md) guidelines to get started.
 If you are not using the provided Jenkins automation scripts, you can run the provisioning scripts within a docker runtime independent of your target Kubernetes cluster.
 ```
 # Build provisioning image
-docker build . -t ghcr.io/hyperledger/bevel-build
+docker build . -t ghcr.io/hyperledger/bevel-build:latest
 
 # Run the provisioning scripts
-docker run -it -v $(pwd):/home/bevel/ ghcr.io/hyperledger/bevel-build
+docker run -it -v $(pwd):/home/bevel/ --user ubuntu ghcr.io/hyperledger/bevel-build:latest
+
+# If you want to run a long running container
+docker run --name bevel-build -d -v "$(pwd)":/home/bevel/ --user ubuntu bevel-build:latest tail -f /dev/null
+docker exec -it bevel-build bash
+cd bevel
+# And then run the ansible scripts from /home/bevel
 ```
 
 ## Initial Committers

docs/source/concepts/sequence-diagram.md

@@ -1,6 +1,6 @@
 # Bevel Sequence Diagram
 
-When using Ansible automation in Bevel, it is important to understand the sequence and flow as this will determine how you configure your networking. 
+When using Ansible automation in Bevel, it is important to understand the sequence and flow as this will determine how you confgure your networking. 
 
 !!! tip
 

docs/source/guides/fabric/add-new-channel.md

@@ -74,7 +74,7 @@ This guide explains how to add a new channel in a Hyperledger Fabric network usi
        Execute the following command to run the `add-new-channel.yaml` playbook:
 
        ```
-       ansible-playbook platforms/hyperledger-fabric/configuration/add-new-channel.yaml --extra-vars "@path-to-network.yaml" -e genererate_configtx=true
+       ansible-playbook platforms/hyperledger-fabric/configuration/add-new-channel.yaml --extra-vars "@path-to-network.yaml" -e generate_configtx=true
        ```
        Replace `path-to-network.yaml` with the actual path to your updated `network.yaml` file.
 

docs/source/guides/fabric/external-chaincode-operations.md

@@ -20,7 +20,7 @@ Once a Hyperledger Fabric network is up using Bevel, Bevel users might want to d
       - `CHAINCODE_TLS_DISABLED`: Boolean flag for if TLS is disabled
       - `CHAINCODE_TLS_KEY`: If TLS is enabled, path to the Client key
       - `CHAINCODE_TLS_CERT`: If TLS is enabled, path to the Client certificate
-      - `CHAINCODE_CLIENT_CA_CERT`: If TLS is enabled, path to the Root CA certificate
+      - `CHAINCODE_CLIENT_CA_CERT`: If TLS is enabled, path to the Root CA cetificate
 
     A sample chaincode server snippet in GOLANG is below, details can be found [here](https://github.com/hyperledger/fabric-samples/blob/main/asset-transfer-basic/chaincode-external/assetTransfer.go):
     ```go

platforms/hyperledger-fabric/charts/fabric-ca-server/Chart.yaml

@@ -7,7 +7,7 @@
 apiVersion: v1
 name: fabric-ca-server
 description: "Hyperledger Fabric: Deploys Fabric CA server"
-version: 1.1.0
+version: 1.3.1
 appVersion: latest
 keywords:
   - bevel
@@ -20,8 +20,8 @@ keywords:
   - accenture
 home: https://hyperledger-bevel.readthedocs.io/en/latest/
 sources:
-  - https://github.com/hyperledger/bevel
+  - https://github.com/hyperledger-bevel/bevel
 maintainers:
   - name: Hyperledger Bevel maintainers
-    email: bevel@lists.hyperledger.org
+    email: bevel@lists.lfdecentralizedtrust.org
 

platforms/hyperledger-fabric/charts/fabric-ca-server/requirements.yaml

@@ -14,4 +14,5 @@ dependencies:
     repository: "file://../../../shared/charts/bevel-storageclass"
     tags:
       - storage
-    version: ~1.0.0
+    version: ~1.3.1
+    condition: storage.enabled

platforms/hyperledger-fabric/charts/fabric-ca-server/templates/statefulset.yaml

@@ -286,7 +286,7 @@ spec:
         {{- include "labels.pvc" . | nindent 8 }}
     spec:
       accessModes: ["ReadWriteOnce"]
-      storageClassName: storage-{{ .Release.Name }}
+      storageClassName: {{ .Values.storage.nameOverride }}
       resources:
         requests:
           storage: "{{ .Values.storage.size }}"

platforms/hyperledger-fabric/charts/fabric-ca-server/values.yaml

@@ -48,6 +48,11 @@ global:
     externalUrlSuffix: test.blockchaincloudpoc.com
 
 storage:
+  #Flag to create new storage class for organization. Set to false for existing storage class.
+  #Eg. enabled: true
+  enabled: true
+  # Name override for storageclass
+  nameOverride: aws-storageclass
   #Provide the size for CA
   #Eg. size: 512Mi
   size: 512Mi

platforms/hyperledger-fabric/charts/fabric-cacti-connector/Chart.yaml

@@ -7,6 +7,6 @@ apiVersion: v2
 name: fabric-cacti-connector
 description: "Hyperledger Fabric: Deploys Cactus Fabric Connector."
 type: application
-version: 1.0.0
+version: 1.3.1
 # For Cactus release 1.1.3
 appVersion: "1.1.3"

platforms/hyperledger-fabric/charts/fabric-cacti-connector/README.md

@@ -21,7 +21,7 @@
 <a name = "fabric-cacti-connector-hyperledger-fabric-deployment-helm-chart"></a>
 ## Fabric Connector Hyperledger Fabric Deployment Helm Chart
 ---
-A [Helm chart](https://github.com/hyperledger/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric_connector) for Cactus Fabric Connector.
+A [Helm chart](https://github.com/hyperledger-bevel/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric_connector) for Cactus Fabric Connector.
 
 
 <a name = "prerequisites"></a>
@@ -68,7 +68,7 @@ fabric_connector/
 <a name = "configuration"></a>
 ## Configuration
 ---
-The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric_connector/values.yaml) file contains configurable values for the Helm chart. We can modify these values according to the deployment requirements. Here are some important configuration options:
+The [values.yaml](https://github.com/hyperledger-bevel/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric_connector/values.yaml) file contains configurable values for the Helm chart. We can modify these values according to the deployment requirements. Here are some important configuration options:
 
 ### Metadata
 
@@ -160,7 +160,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
 
 To deploy the fabric_connector Helm chart, follow these steps:
 
-1. Modify the [values.yaml](https://github.com/hyperledger/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric_connector/values.yaml) file to set the desired configuration values.
+1. Modify the [values.yaml](https://github.com/hyperledger-bevel/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric_connector/values.yaml) file to set the desired configuration values.
 2. Run the following Helm command to install the chart:
     ```
     $ helm repo add bevel https://hyperledger.github.io/bevel/
@@ -186,7 +186,7 @@ Replace `<namespace>` with the actual namespace where the deployment was created
 ## Updating the Deployment
 ---
 
-If we need to update the deployment with new configurations or changes, modify the same [values.yaml](https://github.com/hyperledger/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric_connector/values.yaml) file with the desired changes and run the following Helm command:
+If we need to update the deployment with new configurations or changes, modify the same [values.yaml](https://github.com/hyperledger-bevel/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric_connector/values.yaml) file with the desired changes and run the following Helm command:
 ```
 $ helm upgrade <release-name> ./fabric_connector
 ```
@@ -207,7 +207,7 @@ Replace `<release-name>` with the name of the release. This command will remove
 <a name = "contributing"></a>
 ## Contributing
 ---
-If you encounter any bugs, have suggestions, or would like to contribute to the [Fabric Connector Hyperledger Fabric Deployment Helm Chart](https://github.com/hyperledger/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric_connector), please feel free to open an issue or submit a pull request on the [project's GitHub repository](https://github.com/hyperledger/bevel).
+If you encounter any bugs, have suggestions, or would like to contribute to the [Fabric Connector Hyperledger Fabric Deployment Helm Chart](https://github.com/hyperledger-bevel/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric_connector), please feel free to open an issue or submit a pull request on the [project's GitHub repository](https://github.com/hyperledger-bevel/bevel).
 
 
 <a name = "license"></a>

platforms/hyperledger-fabric/charts/fabric-catools/Chart.yaml

@@ -7,7 +7,7 @@
 apiVersion: v1
 name: fabric-catools
 description: "Hyperledger Fabric: Generates Fabric Certificates and Keys"
-version: 1.1.0
+version: 1.3.1
 appVersion: latest
 keywords:
   - bevel
@@ -20,7 +20,7 @@ keywords:
   - accenture
 home: https://hyperledger-bevel.readthedocs.io/en/latest/
 sources:
-  - https://github.com/hyperledger/bevel
+  - https://github.com/hyperledger-bevel/bevel
 maintainers:
   - name: Hyperledger Bevel maintainers
-    email: bevel@lists.hyperledger.org
+    email: bevel@lists.lfdecentralizedtrust.org

platforms/hyperledger-fabric/charts/fabric-catools/templates/job-cleanup.yaml

@@ -33,7 +33,7 @@ spec:
         app.kubernetes.io/release: {{ .Release.Name }}
         app.kubernetes.io/managed-by: helm
     spec:
-      serviceAccountName: {{ .Values.global.serviceAccountName }}      
+      serviceAccountName: {{ .Values.global.serviceAccountName }}
       restartPolicy: "Never"
       {{- if .Values.image.pullSecret }}
       imagePullSecrets:

platforms/hyperledger-fabric/charts/fabric-chaincode-approve/Chart.yaml

@@ -8,4 +8,4 @@ apiVersion: v1
 appVersion: "2.0"
 description: "Hyperledger Fabric: Approves the chaincode."
 name: fabric-chaincode-approve
-version: 1.0.0
+version: 1.3.1

platforms/hyperledger-fabric/charts/fabric-chaincode-approve/README.md

@@ -21,7 +21,7 @@
 <a name = "approve-chaincode-hyperledger-fabric-deployment-helm-chart"></a>
 ## Approve Chaincode Hyperledger Fabric Deployment Helm Chart
 ---
-A [Helm chart](https://github.com/hyperledger/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric-chaincode-approve) to approve the chaincode.
+A [Helm chart](https://github.com/hyperledger-bevel/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric-chaincode-approve) to approve the chaincode.
 
 <a name = "prerequisites"></a>
 ## Prerequisites
@@ -62,7 +62,7 @@ fabric-chaincode-approve/
 <a name = "configuration"></a>
 ## Configuration
 ---
-The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric-chaincode-approve/values.yaml) file contains configurable values for the Helm chart. We can modify these values according to the deployment requirements. Here are some important configuration options:
+The [values.yaml](https://github.com/hyperledger-bevel/bevel/blob/develop/platforms/hyperledger-fabric/charts/fabric-chaincode-approve/values.yaml) file contains configurable values for the Helm chart. We can modify these values according to the deployment requirements. Here are some important configuration options:
 
 ## Parameters
 ---
@@ -119,7 +119,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
 | endorsementpolicies           | Endorsement policies for the chaincode                    | ""                                        |
 | repository.hostname           | Hostname of the chaincode repository                      | github.com                                |
 | repository.git_username       | Git username for the chaincode repository                 | user                                      |
-| repository.url                | URL of the chaincode repository                           | github.com/hyperledger/bevel-samples.git  |
+| repository.url                | URL of the chaincode repository                           | github.com/hyperledger-bevel/bevel-samples.git  |
 | repository.branch             | Branch of the chaincode repository                        | main                                      |
 | repository.path               | Path to the chaincode within the repository               | .                                         |
 | repository.collectionsconfig  | Collections configuration for the chaincode               | ""                                        |
@@ -139,7 +139,7 @@ The [values.yaml](https://github.com/hyperledger/bevel/blob/develop/platforms/hy
 
 To deploy the fabric-chaincode-approve Helm chart, follow these steps:
 
-1. Modify the [values.yaml](https://github.com/hyperledger/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric-chaincode-approve/values.yaml) file to set the desired configuration values.
+1. Modify the [values.yaml](https://github.com/hyperledger-bevel/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric-chaincode-approve/values.yaml) file to set the desired configuration values.
 2. Run the following Helm command to install the chart:
     ```
     $ helm repo add bevel https://hyperledger.github.io/bevel/
@@ -165,7 +165,7 @@ Replace `<namespace>` with the actual namespace where the Job was created. This
 ## Updating the Deployment
 ---
 
-If we need to update the deployment with new configurations or changes, modify the same [values.yaml](https://github.com/hyperledger/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric-chaincode-approve/values.yaml) file with the desired changes and run the following Helm command:
+If we need to update the deployment with new configurations or changes, modify the same [values.yaml](https://github.com/hyperledger-bevel/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric-chaincode-approve/values.yaml) file with the desired changes and run the following Helm command:
 ```
 $ helm upgrade <release-name> ./fabric-chaincode-approve
 ```
@@ -185,7 +185,7 @@ Replace `<release-name>` with the name of the release. This command will remove
 <a name = "contributing"></a>
 ## Contributing
 ---
-If you encounter any bugs, have suggestions, or would like to contribute to the [Approve Chaincode Hyperledger Fabric Deployment Helm Chart](https://github.com/hyperledger/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric-chaincode-approve), please feel free to open an issue or submit a pull request on the [project's GitHub repository](https://github.com/hyperledger/bevel).
+If you encounter any bugs, have suggestions, or would like to contribute to the [Approve Chaincode Hyperledger Fabric Deployment Helm Chart](https://github.com/hyperledger-bevel/bevel/blob/main/platforms/hyperledger-fabric/charts/fabric-chaincode-approve), please feel free to open an issue or submit a pull request on the [project's GitHub repository](https://github.com/hyperledger-bevel/bevel).
 
 <a name = "license"></a>
 ## License

platforms/hyperledger-fabric/charts/fabric-chaincode-approve/values.yaml

@@ -102,7 +102,7 @@ chaincode:
     # Git username for the chaincode repository
     git_username: "user"
     # URL of the chaincode repository
-    url: "github.com/hyperledger/bevel-samples.git"
+    url: "github.com/hyperledger-bevel/bevel-samples.git"
     # Branch of the chaincode repository
     branch: "main"
     # Path to the chaincode within the repository

platforms/hyperledger-fabric/charts/fabric-chaincode-commit/Chart.yaml

@@ -8,4 +8,4 @@ apiVersion: v1
 appVersion: "2.0"
 description: "Hyperledger Fabric: Commits a chaincode to a channel."
 name: fabric-chaincode-commit
-version: 1.0.0
+version: 1.3.1