epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-22 17:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update test-network-k8s to use two digit version (#668)

Browse source 
Instead of using the Fabric and Fabric CA three digit version (2.4.3),
utilize the two digit version (2.4).
Each time a Fabric/FabricCA release is pushed to dockerhub the two digit version tag is updated.
This approach simplifies maintenance so that scripts don't have to be updated for every
third digit release.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
Dave Enyeart 2022-03-03 18:16:19 -05:00 committed by GitHub
parent b2d74ddbab
commit 67d3c65847
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 133 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test-network-k8s/docs/KUBERNETES.md
View file

@ -195,4 +195,3 @@ Example configurations for common cloud vendors:
### Azure ### Azure
## Next : [Fabric Certificate Authorities](CA.md) ## Next : [Fabric Certificate Authorities](CA.md)

4
test-network-k8s/docs/TEST_NETWORK.md
View file

@ -159,9 +159,6 @@ cat kube/org2/org2-peer1.yaml | sed 's,{{FABRIC_VERSION}},'${FABRIC_VERSION}',g'
cat kube/org2/org2-peer2.yaml | sed 's,{{FABRIC_VERSION}},'${FABRIC_VERSION}',g' | kubectl -n $NS -f - cat kube/org2/org2-peer2.yaml | sed 's,{{FABRIC_VERSION}},'${FABRIC_VERSION}',g' | kubectl -n $NS -f -
``` ```
- [x] Pro tip: Run an early-release Fabric build by setting `TEST_NETWORK_FABRIC_VERSION=2.4.0-beta`
## Next Steps : ## Next Steps :
After the peers and orderers have started, the Kube namespace includes pods, deployments, and service bindings for: After the peers and orderers have started, the Kube namespace includes pods, deployments, and service bindings for:
@ -187,4 +184,3 @@ After the peers and orderers have started, the Kube namespace includes pods, dep
### Next : [Working With Channels](CHANNELS.md) ### Next : [Working With Channels](CHANNELS.md)

5
test-network-k8s/network
View file

@ -21,8 +21,8 @@ set -o errexit
# todo: refactor query/invoke to specify chaincode name (-n param) # todo: refactor query/invoke to specify chaincode name (-n param)
CONTAINER_CLI=${CONTAINER_CLI:-docker} CONTAINER_CLI=${CONTAINER_CLI:-docker}
FABRIC_VERSION=${TEST_NETWORK_FABRIC_VERSION:-2.4.3} FABRIC_VERSION=${TEST_NETWORK_FABRIC_VERSION:-2.4}
FABRIC_CA_VERSION=${TEST_NETWORK_FABRIC_CA_VERSION:-1.5.2} FABRIC_CA_VERSION=${TEST_NETWORK_FABRIC_CA_VERSION:-1.5}
FABRIC_CONTAINER_REGISTRY=${TEST_NETWORK_FABRIC_CONTAINER_REGISTRY:-hyperledger} FABRIC_CONTAINER_REGISTRY=${TEST_NETWORK_FABRIC_CONTAINER_REGISTRY:-hyperledger}
NETWORK_NAME=${TEST_NETWORK_NAME:-test-network} NETWORK_NAME=${TEST_NETWORK_NAME:-test-network}
CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind} CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind}
@ -192,4 +192,3 @@ else
print_help print_help
exit 1 exit 1
fi fi