From 49749c65846b2d03e0b646150297532bc2543cc6 Mon Sep 17 00:00:00 2001 From: Tatsuya Sato Date: Wed, 26 Oct 2022 18:43:26 +0900 Subject: [PATCH] Minor fixes and improvements to test-network-k8s (#849) Signed-off-by: Tatsuya Sato Signed-off-by: Tatsuya Sato --- test-network-k8s/docs/CHAINCODE.md | 2 +- test-network-k8s/docs/KUBERNETES.md | 2 +- test-network-k8s/scripts/cluster.sh | 4 +--- test-network-k8s/scripts/fabric_config.sh | 5 ++++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test-network-k8s/docs/CHAINCODE.md b/test-network-k8s/docs/CHAINCODE.md index 5e14d467..1535e53c 100644 --- a/test-network-k8s/docs/CHAINCODE.md +++ b/test-network-k8s/docs/CHAINCODE.md @@ -148,7 +148,7 @@ $ ./network chaincode query asset-transfer-basic '{"Args":["ReadAsset","1"]}' | ### Describe ```shell -$ ./network chaincode metadata asset-transfer-basic | jq | head +$ ./network chaincode metadata asset-transfer-basic | awk "NR==3,NR==3 {print}" | jq | head { "info": { "title": "undefined", diff --git a/test-network-k8s/docs/KUBERNETES.md b/test-network-k8s/docs/KUBERNETES.md index ee03df96..74e47fd3 100644 --- a/test-network-k8s/docs/KUBERNETES.md +++ b/test-network-k8s/docs/KUBERNETES.md @@ -200,7 +200,7 @@ make docker # in hyperledger/fabric export TEST_NETWORK_FABRIC_VERSION=2.4.0 -./network load-images +./network cluster load-images ./network up ``` diff --git a/test-network-k8s/scripts/cluster.sh b/test-network-k8s/scripts/cluster.sh index 4da958b0..1d04bfdf 100644 --- a/test-network-k8s/scripts/cluster.sh +++ b/test-network-k8s/scripts/cluster.sh @@ -64,9 +64,7 @@ function cluster_init() { if [ "${STAGE_DOCKER_IMAGES}" == true ]; then pull_docker_images - load_docker_images - pull_docker_images_for_rest_sample - load_docker_images_for_rest_sample + kind_load_docker_images fi } diff --git a/test-network-k8s/scripts/fabric_config.sh b/test-network-k8s/scripts/fabric_config.sh index fb478490..d4c7eee2 100755 --- a/test-network-k8s/scripts/fabric_config.sh +++ b/test-network-k8s/scripts/fabric_config.sh @@ -73,7 +73,10 @@ function apply_k8s_builders() { push_fn "Installing k8s chaincode builders" apply_template kube/org1/org1-install-k8s-builder.yaml $ORG1_NS - apply_template kube/org2/org2-install-k8s-builder.yaml $ORG1_NS + apply_template kube/org2/org2-install-k8s-builder.yaml $ORG2_NS + + kubectl -n $ORG1_NS wait --for=condition=complete --timeout=60s job/org1-install-k8s-builder + kubectl -n $ORG2_NS wait --for=condition=complete --timeout=60s job/org2-install-k8s-builder pop_fn } \ No newline at end of file