Commit graph

42 commits

Author SHA1 Message Date
Tatsuya Sato
ce5aa883ee test-network-k8s: Improve prereqs logic
This patch improves prereqs logic in test-network-k8s.
- Use the newer install script instead of bootstrap.sh
- Download binaries matching the Docker image versions, instead of the latest version
- Add checks for Fabric versions to ensure consistency between images and binaries

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2024-08-21 12:29:22 -04:00
Tatsuya Sato
e4af8fe198 test-network-k8s: bump k8s-builder and couchdb
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2024-06-04 12:56:19 -04:00
David Enyeart
bf61094231 Remove double quotes for env variables
Double quotes have caused issues in some environments,
e.g. see https://github.com/hyperledger/fabric/issues/4358

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2024-05-07 01:06:09 +09:00
Arne Rutjes
a708af9159 add optional extra arguments to lifecycle commands for more flexibility
Signed-off-by: Arne Rutjes <arne123@gmail.com>
2024-02-09 09:16:58 -05:00
wisecoach
9e38280be2 fixed test-network-k8s/scripts/test_network.sh missing
fixed test-network-k8s/scripts/channel.sh missing

Signed-off-by: wisecoach <827165648@qq.com>
2023-04-24 17:11:12 -04:00
Tatsuya Sato
49749c6584
Minor fixes and improvements to test-network-k8s (#849)
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-10-26 05:43:26 -04:00
Basil K Y
d1b3253cc5
separate namespace for each organization (#817)
* seperate namespace for each organization

Signed-off-by: Basil K Y <techiebasil@gmail.com>

* rest server working

Signed-off-by: Basil K Y <techiebasil@gmail.com>

* use single namespace by default, fix k8s buider

Signed-off-by: Basil K Y <techiebasil@gmail.com>

* added ci test for testing k8s n/w on multiple namespaces

Signed-off-by: Basil K Y <techiebasil@gmail.com>

* fix: access rest server via gateway

Signed-off-by: Basil K Y <techiebasil@gmail.com>

Signed-off-by: Basil K Y <techiebasil@gmail.com>
2022-08-26 12:39:45 -04:00
jkneubuh
1e8fd5cd56
Update k8s CC builder to v7.2; Use *.localho.st loopback domain; Optionally bind docker reg to 0.0.0.0 (#811)
* 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>
2022-08-08 12:05:48 +01:00
jkneubuh
9f9cec7195
Run RCAADMIN registration on the host OS, not in k8s (#809)
* Run RCAADMIN registration on the host OS, not in k8s

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

* Fix a typo that caused the log trailer to not exit cleanly on error

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

* allow a node registration to have been previously created.  This allows for multiple 'network up' targets to be run.

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-08-05 13:17:05 +01:00
jkneubuh
cb4355125f
Feature/ca v1.5.5 (#788)
* bump CA to v1.5.5; Fabric to v2.4.4

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

* Reorganizes the kube test network environment default parameters to align on column boundaries.

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

* Run k8s sample network tests against latest MAJOR.MINOR release of fabric, CA docker hub images.

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-08-01 14:58:12 +01:00
destinysky
9f844e5de3
Fix namespace in k8s configuration files (#784)
Issues:
1. When the name of NETWORK_NAME or NS in file "network" (i.e., the namespace in k8s) is changed from "test-network", the resources in the k8s cluster cannot be created successfully when the command "./network up" is executed.
Error message: error: the namespace from the provided object "test-network" does not match the namespace "xxxxxx". You must pass '--namespace=test-network' to perform this operation.
2. org2-cc.yaml is not completed.

Fix:
1. Replace "test-network" in yaml files in folder "kube" with "${NS}".
2. Complete "org2-cc-template.yaml" by referring to "org1-cc-template.yaml".

Signed-off-by: destinysky <kangrui10@126.com>
2022-07-04 08:36:36 -04:00
jkneubuh
525ff9f590
Feature/fabric builder k8s (#739)
* Support the fabric-builder-k8s for the chaincode "easy button."

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

* Run the CI/CD test suite using the correct matrix env for k8s builder

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

* Incorporate review feedback : remove zz_unused and pkgk8scc routines

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-26 13:52:25 +01:00
fiadanza
8662b10c58
fix to replace 443 with NGINX_HTTPS_PORT (#745)
Signed-off-by: fiadanza <francesco.iadanza@gmail.com>
2022-05-19 06:16:39 -04:00
Josh Kneubuhl
0322313a9a Includes new 'cluster init' target; Prints errors to the STDOUT
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
3a12817c4f test network runs on containerd AND mobyd
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
47faca36e0 Add a workaround for DNS timeouts when connecting to the orderers
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
49fa452864 Address review feedback - better prereq checks
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
551250636d Run the Kube Test Network on Rancher / k3s
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
jkneubuh
eeb4e611c7
Provide clear guidance for debugging Java chaincode as a service #684 (#724)
* Addresses Issue #548 by providing a simple guide for running Java chaincode as a service with a local debugger.

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

* missed a couple of bash syntax errors

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

* Add metadata and activate examples to the CC README

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

* move ccpackage/ contents into network script

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

* Fix CI test - Azure mounts git checkout at a different folder root path

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

* Update test-network-k8s README with updated cc deploy commands

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

* Run basic-asset transfer CI tests with Java + golang CC in Azure

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

* remove (obsolete) test-net chaincode/ folder

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

* Address some PR review feedback points - README reorg

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

* Use the SDKs contract router Main, not a local entrypoint

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

* bump the build - remove trailing newlines from a README

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-26 15:33:14 +01:00
James Taylor
5ad54564db
Allow custom peer images for test-network-k8s (#725)
The Hyperledger provided Fabric peer images are only a sample so it would be good to make the k8s test network peer image configurable, for example to include a custom builder

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2022-04-25 15:18:52 +00:00
Tatsuya Sato
f8df5452d8
test-network-k8s: Support for Loading images for rest sample to KIND (#713)
This patch supports for pulling all images to the local docker cache
and loading to KIND.

Also, this adds the missing docker image pulling (couchdb) for Fabric.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-04-18 06:13:20 -04:00
jkneubuh
5414889399
fixes #708 : ca enrollments should be made with the ROOT CA cert (#710)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-08 17:05:42 +01:00
jkneubuh
40bfa49a80
Updates the README and documentation guide for the Kube test network's usage of Nginx ingress (#697)
* Update test-network-k8s README and docs with new Nginx Ingress

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

* Update cert paths in application_connection target

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-04 04:25:59 -04:00
jkneubuh
a3ae179efb
test-network-k8s : Connect to Fabric services via Nginx Ingress - READY FOR MERGE (#692)
* Access the test network services via a local Nginx ingress controller.

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

* Run E2E / CI test suite against the Ingress based k8s test network

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

* Improved wait for Nginx Ingress - this was causing some test flakes

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-03-31 17:12:51 +01:00
Charalampos Argyriou
bb57b3cf8f
Override default port of CA connection (#678)
Signed-off-by: Charalarg <charalarg@gmail.com>
2022-03-16 15:28:25 -04:00
Sam Yuan
2457b387c4
impl for couchdb supports in test0network8s as hardcode (#651)
* impl for couchdb supports in test0network8s as hardcode

Signed-off-by: Sam Yuan <yy19902439@126.com>

* fix up according to pr review comments

Signed-off-by: Sam Yuan <yy19902439@126.com>
2022-02-21 06:07:24 -05:00
Charalampos Argyriou
f3db0572d0
test-network-k8s: High availability on application connection profiles (#639)
* Add peer gateway-svc as dnsNames on each peer's certificate

Signed-off-by: Charalarg <charalarg@gmail.com>

* Replace peer1 connections with gateway-svc in connection profiles of applications

Signed-off-by: Charalarg <charalarg@gmail.com>

* Update the org2 peer Gateway CSR host aliases to reference org2

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

Co-authored-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-02-14 04:54:09 -05:00
jkneubuh
fee6a44fcd
Run a basic-asset-transfer CI test on Kubernetes (#637)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-02-08 15:51:02 +00:00
jkneubuh
35be8f7425
Employs the Kubernetes cert-manager for storage and organization of TLS certificates. (#612)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-02-08 09:31:09 +00:00
James Taylor
5edae7c444
Update samples to use published fabric-rest-sample (#626)
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2022-02-03 12:15:29 -05:00
Vinay Aggarwal
29ff95e2c6
Added 'jq' to prerequisite and readme for k8s test network (#582)
Signed-off-by: Vinay <vinayaggarwal@softwaysolutions.com>

Co-authored-by: Vinay <vinayaggarwal@softwaysolutions.com>
2022-01-14 13:13:06 -05:00
Matthew B White
e07a9ff86b
Adding examples of CCAAS and support into the test-network-k8s (#527)
* Changes to the test-network k8s deployment to use the
built-in as-a-service chaincode builder from the Peer Container

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

* Remove the ccaas init container from org2 peer; tweak docs on ccaas config

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

Co-authored-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2021-12-17 14:09:03 +00:00
sapthasurendran
9df7e9f86d
Configtxlator script changes (#552)
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
2021-12-09 11:37:38 +00:00
Matthew B White
a97e8d1267
Get label for chaincode from metadata.json (#509)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-11-22 08:25:38 -05:00
jkneubuh
ab19b8e01d
Address Issue #511 with docs and better error handling (#533)
* Address Issue #511 with docs and better error handling

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

* Set the TEST_NETWORK_FABRIC_VERSION in documentation for local development.

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2021-11-19 16:09:58 +00:00
Matthew B White
d19a7e4b02
Setup basic HA features for the Peers (#532)
- Add a new label to each peer to mark which org it is in
- Create new service per org, that matches this label - so the service can pick from one of multiple pods
- Update the kubeproxy to give more choice of ha stratergies
- Update the application configmaps and samples to refer to this new service rather than specific peers

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-11-19 16:08:26 +00:00
jkneubuh
8183da6666
Add an option to stage docker images locally to KIND (#528)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2021-11-10 09:56:57 +00:00
Sam Yuan
0a1efc45cd
nit fixs (#519)
1. busybox latest image tag
2. pull images with more images
3. load images to kind cluster at local

Signed-off-by: Sam Yuan <yy19902439@126.com>
2021-11-02 15:43:31 +00:00
Matthew B White
6627cd6d65 review cmts
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-11-01 16:15:30 -04:00
Matthew B White
337584045d Updated logging
- updated the logging for the application command; wasn't very good
- added some information to the help option. the current settings
  useful if you're not sure what you've set

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-11-01 16:15:30 -04:00
jkneubuh
1b1ef046c1
Allow overrides of the docker registry for fabric images (#518)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2021-10-27 16:24:26 +01:00
jkneubuh
30fb81a341
Run the fabric test network on Kubernetes (#498)
* Run the fabric test network on Kubernetes

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

* Re-LINT

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2021-10-06 15:50:39 +00:00