From b5a69f3f887bc905fb70857ac2785d31603d9924 Mon Sep 17 00:00:00 2001 From: Muthu Date: Tue, 27 Aug 2024 17:01:54 +0530 Subject: [PATCH 1/3] Added Ingress Removal command in the Doc Signed-off-by: Muthu --- examples/fabproxy-removal/README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/fabproxy-removal/README.md b/examples/fabproxy-removal/README.md index 1bea359..9415e40 100644 --- a/examples/fabproxy-removal/README.md +++ b/examples/fabproxy-removal/README.md @@ -134,7 +134,7 @@ Navigate to the Settings tab in the left hand navigation. You will see a section An alternate method for determining the channel list. Please execute the below command to find the list of channel associated with the network and update channel variable files. ``` -kubectl exec -it [Ordrer Node Name] -c orderer -n [Namespace] -- ls /ordererdata/ledger/ibporderer/chains | xargs printf ' - %s \n' +kubectl exec -it [Ordrer Node Name] -c orderer -n [namespace] -- ls /ordererdata/ledger/ibporderer/chains | xargs printf ' - %s \n' ``` s This is how the `common-vars.yml` definition appears. Edit the variable file. @@ -245,29 +245,35 @@ In the `common-vars.yml`, set the `dry-run` variable to true for the first run. ``` 3. Once the above steps executed check the application channel config. The peer address are migrated. -# Verify the HLF Instance of the Post execution +# Verify the IBM Support for Hyperledger Fabric instance after the FabProxy migration: **Step 1:** Remove the Peer and Orderer external addresses from their respective CRSpec using the following commands. ``` -kubectl get ibppeer -n [Namespace] --no-headers=true -o custom-columns=":metadata.name" | xargs kubectl patch ibppeer [Peer Name] -n [Namespace] --type merge --patch '{"spec":{"peerExternalEndpoint":""}}' +kubectl get ibppeer -n [namespace] --no-headers=true -o custom-columns=":metadata.name" | xargs kubectl patch ibppeer [Peer Name] -n [namespace] --type merge --patch '{"spec":{"peerExternalEndpoint":""}}' -kubectl get ibporderer -n [Namespace] --no-headers=true -o custom-columns=":metadata.name" | xargs kubectl patch ibporderer [Orderer Name] -n [Namespace] --type merge --patch '{"spec":{"externalAddress":""}}' +kubectl get ibporderer -n [namespace] --no-headers=true -o custom-columns=":metadata.name" | xargs kubectl patch ibporderer [Orderer Name] -n [namespace] --type merge --patch '{"spec":{"externalAddress":""}}' ``` **Step 2:** Remove the deployments of Peer, Orderer, and CA. Once removed, the operator will restart the deployments. Ensure the deployments are up. ``` -kubectl delete deployment [peer/orderer/ca] -n [Namespace] +kubectl delete deployment [peer/orderer/ca] -n [namespace] ``` Note: When deleting deployments, delete them one by one and ensure that the corresponding pods are up and running. -**Step 3** Recommend deleting all ingresses in the namespace where the blockchain components are hosted. +**Step 3** Recommend deleting all ingresses in the namespace where the blockchain components are hosted. Delete the components ingress using the below comments. + +``` +kubectl get ingress -n [namespace] + +kubectl delete ingress [component-ingress-name] -n [namespace] +``` **Step 4** Restart the operator by deleting the operator pods. ``` -kubectl delete pod [operator-pod-name] -n [Namespace] +kubectl delete pod [operator-pod-name] -n [namespace] ``` **Step 5:** Verify that the ports for the HLF components(Peer/CA/Orderer) have been updated to 443. From 9a9d60056fac2dc6760cdffa4910fcbba7893fc9 Mon Sep 17 00:00:00 2001 From: Muthu Date: Wed, 28 Aug 2024 12:24:51 +0530 Subject: [PATCH 2/3] FabProxy doc content modification as per the review and test Signed-off-by: Muthu --- examples/fabproxy-removal/README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/fabproxy-removal/README.md b/examples/fabproxy-removal/README.md index 9415e40..beaa886 100644 --- a/examples/fabproxy-removal/README.md +++ b/examples/fabproxy-removal/README.md @@ -120,9 +120,13 @@ Navigate to the Settings tab in the left hand navigation. You will see a section ## Step 3: Editing the variable files. - Variable files are used to store variables that are used across multiple Ansible playbooks. Each organization has their own variable file, and you must edit these files to specify the connection details for the instance for that organization.The playbook repository has two ansible variable files such as` chanels.yml` and `common-vars.yml`. + Variable files are used to store variables that are used across multiple Ansible playbooks. Each organization has their own variable file, and you must edit these files to specify the connection details for the instance for that organization.The playbook repository has two ansible variable files such as` channels.yml` and `common-vars.yml`. - This is how the `console.yml` definition appears. It has the System channel name and the Application channel name by default. if the client's orderer node with system channel. Since `testchainid` is the default system channel name, they don't need to modify it. The customer must alter the name of the appropriate application channel. They have entered each name individually if they have more than one application channel name. If the customer has the orderer node without system channel, they don't need mention the system channel name `testchainid`. + This is how the `channels.yml` definition appears. It has the System channel name and the Application channel name by default. if the client's orderer node with system channel. Since `testchainid` is the default system channel name, they don't need to modify it. The customer must alter the name of the appropriate application channel. They have entered each name individually if they have more than one application channel name. If the customer has the orderer node without system channel, they don't need mention the system channel name `testchainid`. + + ***Note:*** + +If you exclude any channel in the configuration below, those channels will be unused after the FabProxy migration, and there will be no way to recover them. Ensure that you include all the channels you wish to migrate. ``` @@ -136,7 +140,7 @@ An alternate method for determining the channel list. Please execute the below c ``` kubectl exec -it [Ordrer Node Name] -c orderer -n [namespace] -- ls /ordererdata/ledger/ibporderer/chains | xargs printf ' - %s \n' ``` -s + This is how the `common-vars.yml` definition appears. Edit the variable file. - Determine the URL of your instance’s console. @@ -262,7 +266,7 @@ kubectl delete deployment [peer/orderer/ca] -n [namespace] ``` Note: When deleting deployments, delete them one by one and ensure that the corresponding pods are up and running. -**Step 3** Recommend deleting all ingresses in the namespace where the blockchain components are hosted. Delete the components ingress using the below comments. +**Step 3** Recommend deleting all ingresses in the namespace where the blockchain components are hosted. Delete each component's ingress using the commands below. ``` kubectl get ingress -n [namespace] From c9e6702543a7b949292731974d85e73432fd1dc9 Mon Sep 17 00:00:00 2001 From: Muthu Date: Wed, 8 Jan 2025 15:31:41 +0530 Subject: [PATCH 3/3] Fabproxy doc changes Signed-off-by: Muthu --- examples/fabproxy-removal/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/fabproxy-removal/README.md b/examples/fabproxy-removal/README.md index beaa886..8822ec6 100644 --- a/examples/fabproxy-removal/README.md +++ b/examples/fabproxy-removal/README.md @@ -43,7 +43,7 @@ docker run -it --rm -u $(id -u) -v "local fully qualified path to fabproxy remov Example: ``` -docker run -it --rm -u $(id -u) -v ./examples/fabproxy-removal:/playbooks ghcr.io/hyperledger-labs/fabric-ansible:sha-c9330b9 bash +docker run -it --rm -u $(id -u) -v ./examples/fabproxy-removal:/playbooks ghcr.io/hyperledger-labs/fabric-ansible:sha-c7cd5e4 bash ``` At the command prompt, change directory to '/playbooks' and copy the fabproxy removal playbooks. @@ -218,6 +218,9 @@ After migrating all CA addresses. Before proceeding to the next step. If the cus ## Step 7: Migrate the orderering node address. +***Note:*** +In the `common-vars.yml`, set the `dry-run` variable to true for the first run. This will ensure all channels are reachable and all actions can be completeted with making changes to the channels. + 1. The steps migrate renew the Orderer TLS certificate and migrate the Orderer address. @@ -233,10 +236,7 @@ After migrating all CA addresses. Before proceeding to the next step. If the cus 5. Once the aforementioned command has been executed, confirm that the respective Orderer nodes are restarting. If its restarted navigate to the console and click the Orderer node. In the Orderer `info and usage` page the `Operations url` and `API url` port has been changed into `443`. -***Note:*** -In the `common-vars.yml`, set the `dry-run` variable to true for the first run. This will ensure all channels are reachable and all actions can be completeted with making changes to the channels. -!important ## Step 8: Update anchor peer in the channel.