mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-23 01:55:10 +00:00
Switch from *.vcap.me -> *.localho.st for the default loopback domain name
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
This commit is contained in:
Josh Kneubuhl
parent
cd447f2914
commit
a7497ae2bf
6 changed files with 25 additions and 28 deletions
|
|
@ -30,8 +30,8 @@ export CRYPTO_PATH=${CRYPTO_PATH:-../../test-network-k8s/build/channel-msp/peerO
|
|||
export KEY_DIRECTORY_PATH=${KEY_DIRECTORY_PATH:-../../test-network-k8s/build/enrollments/org1/users/org1admin/msp/keystore}
|
||||
export CERT_PATH=${CERT_PATH:-../../test-network-k8s/build/enrollments/org1/users/org1admin/msp/signcerts/cert.pem}
|
||||
export TLS_CERT_PATH=${TLS_CERT_PATH:-../../test-network-k8s/build/channel-msp/peerOrganizations/org1/msp/tlscacerts/tlsca-signcert.pem}
|
||||
export PEER_ENDPOINT=${PEER_ENDPOINT:-org1-peer1.vcap.me:443}
|
||||
export PEER_HOST_ALIAS=${PEER_HOST_ALIAS:-org1-peer1.vcap.me}
|
||||
export PEER_ENDPOINT=${PEER_ENDPOINT:-org1-peer1.localho.st:443}
|
||||
export PEER_HOST_ALIAS=${PEER_HOST_ALIAS:-org1-peer1.localho.st}
|
||||
|
||||
function print() {
|
||||
GREEN='\033[0;32m'
|
||||
|
|
@ -90,7 +90,7 @@ print "Running rest-easy test"
|
|||
( ./network rest-easy \
|
||||
&& sleep 5 \
|
||||
&& export SAMPLE_APIKEY='97834158-3224-4CE7-95F9-A148C886653E' \
|
||||
&& curl -s --header "X-Api-Key: ${SAMPLE_APIKEY}" "http://fabric-rest-sample.vcap.me/api/assets/asset1" | jq )
|
||||
&& curl -s --header "X-Api-Key: ${SAMPLE_APIKEY}" "http://fabric-rest-sample.localho.st/api/assets/asset1" | jq )
|
||||
print "OK"
|
||||
|
||||
stopNetwork
|
||||
|
|
|
|||
|
|
@ -95,16 +95,16 @@ Workarounds to improve DNS resolution time on OSX:
|
|||
|
||||
- Add manual DNS overrides for virtual hosts by adding to /etc/hosts:
|
||||
```
|
||||
127.0.0.1 org0-ca.vcap.me
|
||||
127.0.0.1 org1-ca.vcap.me
|
||||
127.0.0.1 org2-ca.vcap.me
|
||||
127.0.0.1 org0-orderer1.vcap.me
|
||||
127.0.0.1 org0-orderer2.vcap.me
|
||||
127.0.0.1 org0-orderer3.vcap.me
|
||||
127.0.0.1 org1-peer1.vcap.me
|
||||
127.0.0.1 org1-peer2.vcap.me
|
||||
127.0.0.1 org2-peer1.vcap.me
|
||||
127.0.0.1 org2-peer2.vcap.me
|
||||
127.0.0.1 org0-ca.localho.st
|
||||
127.0.0.1 org1-ca.localho.st
|
||||
127.0.0.1 org2-ca.localho.st
|
||||
127.0.0.1 org0-orderer1.localho.st
|
||||
127.0.0.1 org0-orderer2.localho.st
|
||||
127.0.0.1 org0-orderer3.localho.st
|
||||
127.0.0.1 org1-peer1.localho.st
|
||||
127.0.0.1 org1-peer2.localho.st
|
||||
127.0.0.1 org2-peer1.localho.st
|
||||
127.0.0.1 org2-peer2.localho.st
|
||||
```
|
||||
|
||||
- Reduce the system resolver timeout from the default 5s by adding to /etc/resolv.conf:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ $ export SAMPLE_APIKEY=97834158-3224-4CE7-95F9-A148C886653E
|
|||
|
||||
$ ./network chaincode invoke asset-transfer-basic '{"Args":["CreateAsset","1","blue","35","tom","1000"]}'
|
||||
|
||||
$ curl -s --header "X-Api-Key: ${SAMPLE_APIKEY}" http://fabric-rest-sample.vcap.me/api/assets | jq
|
||||
$ curl -s --header "X-Api-Key: ${SAMPLE_APIKEY}" http://fabric-rest-sample.localho.st/api/assets | jq
|
||||
[
|
||||
{
|
||||
"Key": "1",
|
||||
|
|
|
|||
|
|
@ -73,9 +73,9 @@ services to register the channel genesis block configuration on the ordering nod
|
|||
```shell
|
||||
configtxgen -profile TwoOrgsApplicationGenesis -channelID '${CHANNEL_NAME}' -outputBlock genesis_block.pb
|
||||
|
||||
osnadmin channel join --orderer-address org0-orderer1-admin.vcap.me --channelID '${CHANNEL_NAME}' --config-block genesis_block.pb
|
||||
osnadmin channel join --orderer-address org0-orderer2-admin.vcap.me --channelID '${CHANNEL_NAME}' --config-block genesis_block.pb
|
||||
osnadmin channel join --orderer-address org0-orderer3-admin.vcap.me --channelID '${CHANNEL_NAME}' --config-block genesis_block.pb
|
||||
osnadmin channel join --orderer-address org0-orderer1-admin.localho.st --channelID '${CHANNEL_NAME}' --config-block genesis_block.pb
|
||||
osnadmin channel join --orderer-address org0-orderer2-admin.localho.st --channelID '${CHANNEL_NAME}' --config-block genesis_block.pb
|
||||
osnadmin channel join --orderer-address org0-orderer3-admin.localho.st --channelID '${CHANNEL_NAME}' --config-block genesis_block.pb
|
||||
```
|
||||
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ by retrieving the genesis block from the orderers and then joining the channel:
|
|||
fetch oldest \
|
||||
genesis_block.pb \
|
||||
-c '${CHANNEL_NAME}' \
|
||||
-o org0-orderer1.vcap.me \
|
||||
-o org0-orderer1.localho.st \
|
||||
--tls --cafile /var/hyperledger/fabric/organizations/ordererOrganizations/org0.example.com/msp/tlscacerts/org0-tls-ca.pem
|
||||
|
||||
# Join peer1 to the channel.
|
||||
|
|
@ -103,7 +103,7 @@ by retrieving the genesis block from the orderers and then joining the channel:
|
|||
peer channel \
|
||||
join \
|
||||
-b genesis_block.pb \
|
||||
-o org0-orderer1.vcap.me \
|
||||
-o org0-orderer1.localho.st \
|
||||
--tls --cafile /var/hyperledger/fabric/organizations/ordererOrganizations/org0.example.com/msp/tlscacerts/org0-tls-ca.pem
|
||||
|
||||
# Join peer2 to the channel.
|
||||
|
|
@ -111,7 +111,7 @@ by retrieving the genesis block from the orderers and then joining the channel:
|
|||
peer channel \
|
||||
join \
|
||||
-b genesis_block.pb \
|
||||
-o org0-orderer1.vcap.me \
|
||||
-o org0-orderer1.localho.st \
|
||||
--tls --cafile /var/hyperledger/fabric/organizations/ordererOrganizations/org0.example.com/msp/tlscacerts/org0-tls-ca.pem
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -220,19 +220,16 @@ secure access to services, client applications must present the TLS root certifi
|
|||
organization when connecting to peers, orderers, and CAs.
|
||||
|
||||
|
||||
## What is `*.vcap.me` ?
|
||||
## What is `*.localho.st` ?
|
||||
|
||||
In order to expose a dynamic set of DNS host aliases matching the Nginx ingress controller, the test network
|
||||
employs the public DNS wildcard domain `*.vcap.me` to resolve host and subdomains to the local loopback
|
||||
employs the public DNS wildcard domain `*.localho.st` to resolve host and subdomains to the local loopback
|
||||
address 127.0.0.1.
|
||||
|
||||
The vcap.me domain is managed by VMWare and is associated with the
|
||||
[VMWare Cloud Application Platform](https://github.com/cloudfoundry-attic/vcap) (VCAP).
|
||||
|
||||
Using this DNS wildcard alias means that all ingress points bound to the *.vcap.me domain will resolve to your
|
||||
Using this DNS wildcard alias means that all ingress points bound to the *.localho.st domain will resolve to your
|
||||
local host, conveniently routing traffic into the KIND cluster on ports :80 and :443.
|
||||
|
||||
To override the *.vcap.me network ingress domain (for example in cloud-based environments supporting a DNS
|
||||
To override the *.localho.st network ingress domain (for example in cloud-based environments supporting a DNS
|
||||
wildcard resolver) set the `TEST_NETWORK_DOMAIN` environment variable before invoking `./network`
|
||||
targets. E.g.:
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ context NETWORK_NAME test-network
|
|||
context CLUSTER_NAME kind
|
||||
context KUBE_NAMESPACE ${NETWORK_NAME}
|
||||
context NS ${KUBE_NAMESPACE}
|
||||
context DOMAIN vcap.me
|
||||
context DOMAIN localho.st
|
||||
context CHANNEL_NAME mychannel
|
||||
context ORDERER_TIMEOUT 10s # see https://github.com/hyperledger/fabric/issues/3372
|
||||
context TEMP_DIR ${PWD}/build
|
||||
|
|
|
|||
Loading…
Reference in a new issue