From a7497ae2bfb7a606f01f25c34b5943cac195ae7c Mon Sep 17 00:00:00 2001 From: Josh Kneubuhl Date: Sat, 6 Aug 2022 07:36:31 -0400 Subject: [PATCH] Switch from *.vcap.me -> *.localho.st for the default loopback domain name Signed-off-by: Josh Kneubuhl --- ci/scripts/run-k8s-test-network-basic.sh | 6 +++--- test-network-k8s/README.md | 20 ++++++++++---------- test-network-k8s/docs/APPLICATIONS.md | 2 +- test-network-k8s/docs/CHANNELS.md | 12 ++++++------ test-network-k8s/docs/KUBERNETES.md | 11 ++++------- test-network-k8s/network | 2 +- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/ci/scripts/run-k8s-test-network-basic.sh b/ci/scripts/run-k8s-test-network-basic.sh index 2f6de991..ec2cdd14 100755 --- a/ci/scripts/run-k8s-test-network-basic.sh +++ b/ci/scripts/run-k8s-test-network-basic.sh @@ -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 diff --git a/test-network-k8s/README.md b/test-network-k8s/README.md index bdfbfc37..948d1a65 100644 --- a/test-network-k8s/README.md +++ b/test-network-k8s/README.md @@ -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: diff --git a/test-network-k8s/docs/APPLICATIONS.md b/test-network-k8s/docs/APPLICATIONS.md index 699c891f..acf6b98b 100644 --- a/test-network-k8s/docs/APPLICATIONS.md +++ b/test-network-k8s/docs/APPLICATIONS.md @@ -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", diff --git a/test-network-k8s/docs/CHANNELS.md b/test-network-k8s/docs/CHANNELS.md index 768e6ae4..511d1870 100644 --- a/test-network-k8s/docs/CHANNELS.md +++ b/test-network-k8s/docs/CHANNELS.md @@ -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 ``` diff --git a/test-network-k8s/docs/KUBERNETES.md b/test-network-k8s/docs/KUBERNETES.md index 833ab062..ee03df96 100644 --- a/test-network-k8s/docs/KUBERNETES.md +++ b/test-network-k8s/docs/KUBERNETES.md @@ -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.: diff --git a/test-network-k8s/network b/test-network-k8s/network index 1b875963..e696864a 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -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