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

Update k8s CC builder to v7.2; Use *.localho.st loopback domain; Optionally bind docker reg to 0.0.0.0 (#811)

Browse source 
* Update k8s builder to v0.7.1

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* Add LOCAL_REGISTRY_INTERFACE option to bind the insecure docker registry to alternate NICs

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* 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:
jkneubuh 2022-08-08 07:05:48 -04:00 committed by GitHub
parent 9f9cec7195
commit 1e8fd5cd56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ci/scripts/run-k8s-test-network-basic.sh
View file

@ -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 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 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 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_ENDPOINT=${PEER_ENDPOINT:-org1-peer1.localho.st:443}
export PEER_HOST_ALIAS=${PEER_HOST_ALIAS:-org1-peer1.vcap.me} export PEER_HOST_ALIAS=${PEER_HOST_ALIAS:-org1-peer1.localho.st}
function print() { function print() {
GREEN='\033[0;32m' GREEN='\033[0;32m'
@ -90,7 +90,7 @@ print "Running rest-easy test"
( ./network rest-easy \ ( ./network rest-easy \
&& sleep 5 \ && sleep 5 \
&& export SAMPLE_APIKEY='97834158-3224-4CE7-95F9-A148C886653E' \ && 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" print "OK"
stopNetwork stopNetwork

20
test-network-k8s/README.md
View file

@ -95,16 +95,16 @@ Workarounds to improve DNS resolution time on OSX:
- Add manual DNS overrides for virtual hosts by adding to /etc/hosts: - Add manual DNS overrides for virtual hosts by adding to /etc/hosts:
``` ```
127.0.0.1 org0-ca.vcap.me 127.0.0.1 org0-ca.localho.st
127.0.0.1 org1-ca.vcap.me 127.0.0.1 org1-ca.localho.st
127.0.0.1 org2-ca.vcap.me 127.0.0.1 org2-ca.localho.st
127.0.0.1 org0-orderer1.vcap.me 127.0.0.1 org0-orderer1.localho.st
127.0.0.1 org0-orderer2.vcap.me 127.0.0.1 org0-orderer2.localho.st
127.0.0.1 org0-orderer3.vcap.me 127.0.0.1 org0-orderer3.localho.st
127.0.0.1 org1-peer1.vcap.me 127.0.0.1 org1-peer1.localho.st
127.0.0.1 org1-peer2.vcap.me 127.0.0.1 org1-peer2.localho.st
127.0.0.1 org2-peer1.vcap.me 127.0.0.1 org2-peer1.localho.st
127.0.0.1 org2-peer2.vcap.me 127.0.0.1 org2-peer2.localho.st
``` ```
- Reduce the system resolver timeout from the default 5s by adding to /etc/resolv.conf: - Reduce the system resolver timeout from the default 5s by adding to /etc/resolv.conf:

2
test-network-k8s/docs/APPLICATIONS.md
View file

@ -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"]}' $ ./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", "Key": "1",

12
test-network-k8s/docs/CHANNELS.md
View file

@ -73,9 +73,9 @@ services to register the channel genesis block configuration on the ordering nod
```shell ```shell
configtxgen -profile TwoOrgsApplicationGenesis -channelID '${CHANNEL_NAME}' -outputBlock genesis_block.pb 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-orderer1-admin.localho.st --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-orderer2-admin.localho.st --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-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 \ fetch oldest \
genesis_block.pb \ genesis_block.pb \
-c '${CHANNEL_NAME}' \ -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 --tls --cafile /var/hyperledger/fabric/organizations/ordererOrganizations/org0.example.com/msp/tlscacerts/org0-tls-ca.pem
# Join peer1 to the channel. # Join peer1 to the channel.
@ -103,7 +103,7 @@ by retrieving the genesis block from the orderers and then joining the channel:
peer channel \ peer channel \
join \ join \
-b genesis_block.pb \ -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 --tls --cafile /var/hyperledger/fabric/organizations/ordererOrganizations/org0.example.com/msp/tlscacerts/org0-tls-ca.pem
# Join peer2 to the channel. # Join peer2 to the channel.
@ -111,7 +111,7 @@ by retrieving the genesis block from the orderers and then joining the channel:
peer channel \ peer channel \
join \ join \
-b genesis_block.pb \ -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 --tls --cafile /var/hyperledger/fabric/organizations/ordererOrganizations/org0.example.com/msp/tlscacerts/org0-tls-ca.pem
``` ```

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

@ -220,19 +220,16 @@ secure access to services, client applications must present the TLS root certifi
organization when connecting to peers, orderers, and CAs. 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 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. address 127.0.0.1.
The vcap.me domain is managed by VMWare and is associated with the Using this DNS wildcard alias means that all ingress points bound to the *.localho.st domain will resolve to your
[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
local host, conveniently routing traffic into the KIND cluster on ports :80 and :443. 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` wildcard resolver) set the `TEST_NETWORK_DOMAIN` environment variable before invoking `./network`
targets. E.g.: targets. E.g.:

2
test-network-k8s/kube/org1/org1-install-k8s-builder.yaml
View file

@ -18,7 +18,7 @@ spec:
restartPolicy: "Never" restartPolicy: "Never"
containers: containers:
- name: main - name: main
image: ghcr.io/hyperledgendary/k8s-fabric-peer:${K8S_CHAINCODE_BUILDER_VERSION} image: ${K8S_CHAINCODE_BUILDER_IMAGE}:${K8S_CHAINCODE_BUILDER_VERSION}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- sh - sh

2
test-network-k8s/kube/org2/org2-install-k8s-builder.yaml
View file

@ -18,7 +18,7 @@ spec:
restartPolicy: "Never" restartPolicy: "Never"
containers: containers:
- name: main - name: main
image: ghcr.io/hyperledgendary/k8s-fabric-peer:${K8S_CHAINCODE_BUILDER_VERSION} image: ${K8S_CHAINCODE_BUILDER_IMAGE}:${K8S_CHAINCODE_BUILDER_VERSION}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: command:
- sh - sh

6
test-network-k8s/network
View file

@ -41,17 +41,19 @@ context NETWORK_NAME test-network
context CLUSTER_NAME kind context CLUSTER_NAME kind
context KUBE_NAMESPACE ${NETWORK_NAME} context KUBE_NAMESPACE ${NETWORK_NAME}
context NS ${KUBE_NAMESPACE} context NS ${KUBE_NAMESPACE}
context DOMAIN vcap.me context DOMAIN localho.st
context CHANNEL_NAME mychannel context CHANNEL_NAME mychannel
context ORDERER_TIMEOUT 10s # see https://github.com/hyperledger/fabric/issues/3372 context ORDERER_TIMEOUT 10s # see https://github.com/hyperledger/fabric/issues/3372
context TEMP_DIR ${PWD}/build context TEMP_DIR ${PWD}/build
context CHAINCODE_BUILDER ccaas # see https://github.com/hyperledgendary/fabric-builder-k8s/blob/main/docs/TEST_NETWORK_K8S.md context CHAINCODE_BUILDER ccaas # see https://github.com/hyperledgendary/fabric-builder-k8s/blob/main/docs/TEST_NETWORK_K8S.md
context K8S_CHAINCODE_BUILDER_VERSION v0.6.0 context K8S_CHAINCODE_BUILDER_IMAGE ghcr.io/hyperledger-labs/k8s-fabric-peer
context K8S_CHAINCODE_BUILDER_VERSION v0.7.2
context LOG_FILE network.log context LOG_FILE network.log
context DEBUG_FILE network-debug.log context DEBUG_FILE network-debug.log
context LOG_ERROR_LINES 2 context LOG_ERROR_LINES 2
context LOCAL_REGISTRY_NAME kind-registry context LOCAL_REGISTRY_NAME kind-registry
context LOCAL_REGISTRY_INTERFACE 127.0.0.1
context LOCAL_REGISTRY_PORT 5000 context LOCAL_REGISTRY_PORT 5000
context STAGE_DOCKER_IMAGES false context STAGE_DOCKER_IMAGES false
context NGINX_HTTP_PORT 80 context NGINX_HTTP_PORT 80

8
test-network-k8s/scripts/kind.sh
View file

@ -80,11 +80,15 @@ function launch_docker_registry() {
# create registry container unless it already exists # create registry container unless it already exists
local reg_name=${LOCAL_REGISTRY_NAME} local reg_name=${LOCAL_REGISTRY_NAME}
local reg_port=${LOCAL_REGISTRY_PORT} local reg_port=${LOCAL_REGISTRY_PORT}
local reg_interface=${LOCAL_REGISTRY_INTERFACE}
running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)" running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)"
if [ "${running}" != 'true' ]; then if [ "${running}" != 'true' ]; then
docker run \ docker run \
-d --restart=always -p "127.0.0.1:${reg_port}:5000" --name "${reg_name}" \ --detach \
--restart always \
--name "${reg_name}" \
--publish "${reg_interface}:${reg_port}:5000" \
registry:2 registry:2
fi fi