diff --git a/ci/scripts/run-k8s-test-network-basic.sh b/ci/scripts/run-k8s-test-network-basic.sh index e8c6a9f6..180c9d96 100755 --- a/ci/scripts/run-k8s-test-network-basic.sh +++ b/ci/scripts/run-k8s-test-network-basic.sh @@ -6,6 +6,9 @@ # set -euo pipefail +# TODO delete me +export THIRD_PARTY_CONTAINER_REGISTRY=quay.io/lib + # Test matrix parameters export CONTAINER_CLI=${CONTAINER_CLI:-docker} export CLIENT_LANGUAGE=${CLIENT_LANGUAGE:-typescript} diff --git a/test-network-k8s/kube/org0/org0-job-scrub-fabric-volumes.yaml b/test-network-k8s/kube/org0/org0-job-scrub-fabric-volumes.yaml index 92847115..640c2f6f 100644 --- a/test-network-k8s/kube/org0/org0-job-scrub-fabric-volumes.yaml +++ b/test-network-k8s/kube/org0/org0-job-scrub-fabric-volumes.yaml @@ -18,7 +18,7 @@ spec: restartPolicy: "Never" containers: - name: main - image: busybox:latest + image: ${THIRD_PARTY_CONTAINER_REGISTRY}/busybox:latest command: - sh - -c diff --git a/test-network-k8s/kube/org1/org1-job-scrub-fabric-volumes.yaml b/test-network-k8s/kube/org1/org1-job-scrub-fabric-volumes.yaml index 43d66c4a..0ef1c923 100644 --- a/test-network-k8s/kube/org1/org1-job-scrub-fabric-volumes.yaml +++ b/test-network-k8s/kube/org1/org1-job-scrub-fabric-volumes.yaml @@ -18,7 +18,7 @@ spec: restartPolicy: "Never" containers: - name: main - image: busybox:latest + image: ${THIRD_PARTY_CONTAINER_REGISTRY}/busybox:latest command: - sh - -c diff --git a/test-network-k8s/kube/org1/org1-peer1.yaml b/test-network-k8s/kube/org1/org1-peer1.yaml index d6393755..40229ddb 100644 --- a/test-network-k8s/kube/org1/org1-peer1.yaml +++ b/test-network-k8s/kube/org1/org1-peer1.yaml @@ -95,7 +95,7 @@ spec: mountPath: /var/hyperledger/fabric/config/tls readOnly: true - name: couchdb - image: couchdb:${COUCHDB_VERSION} + image: ${THIRD_PARTY_CONTAINER_REGISTRY}/couchdb:${COUCHDB_VERSION} imagePullPolicy: IfNotPresent env: - name: "COUCHDB_USER" diff --git a/test-network-k8s/kube/org1/org1-peer2.yaml b/test-network-k8s/kube/org1/org1-peer2.yaml index f0db8a83..fb8e492a 100644 --- a/test-network-k8s/kube/org1/org1-peer2.yaml +++ b/test-network-k8s/kube/org1/org1-peer2.yaml @@ -96,7 +96,7 @@ spec: mountPath: /var/hyperledger/fabric/config/tls readOnly: true - name: couchdb - image: couchdb:${COUCHDB_VERSION} + image: ${THIRD_PARTY_CONTAINER_REGISTRY}/couchdb:${COUCHDB_VERSION} imagePullPolicy: IfNotPresent env: - name: "COUCHDB_USER" diff --git a/test-network-k8s/kube/org2/org2-job-scrub-fabric-volumes.yaml b/test-network-k8s/kube/org2/org2-job-scrub-fabric-volumes.yaml index b56677f2..b48f1bea 100644 --- a/test-network-k8s/kube/org2/org2-job-scrub-fabric-volumes.yaml +++ b/test-network-k8s/kube/org2/org2-job-scrub-fabric-volumes.yaml @@ -18,7 +18,7 @@ spec: restartPolicy: "Never" containers: - name: main - image: busybox:latest + image: ${THIRD_PARTY_CONTAINER_REGISTRY}/busybox:latest command: - sh - -c diff --git a/test-network-k8s/kube/org2/org2-peer1.yaml b/test-network-k8s/kube/org2/org2-peer1.yaml index 9ad208c2..fca58295 100644 --- a/test-network-k8s/kube/org2/org2-peer1.yaml +++ b/test-network-k8s/kube/org2/org2-peer1.yaml @@ -95,7 +95,7 @@ spec: mountPath: /var/hyperledger/fabric/config/tls readOnly: true - name: couchdb - image: couchdb:${COUCHDB_VERSION} + image: ${THIRD_PARTY_CONTAINER_REGISTRY}/couchdb:${COUCHDB_VERSION} imagePullPolicy: IfNotPresent env: - name: "COUCHDB_USER" diff --git a/test-network-k8s/kube/org2/org2-peer2.yaml b/test-network-k8s/kube/org2/org2-peer2.yaml index 747d8d2e..123d8846 100644 --- a/test-network-k8s/kube/org2/org2-peer2.yaml +++ b/test-network-k8s/kube/org2/org2-peer2.yaml @@ -94,7 +94,7 @@ spec: mountPath: /var/hyperledger/fabric/config/tls readOnly: true - name: couchdb - image: couchdb:${COUCHDB_VERSION} + image: ${THIRD_PARTY_CONTAINER_REGISTRY}/couchdb:${COUCHDB_VERSION} imagePullPolicy: IfNotPresent env: - name: "COUCHDB_USER" diff --git a/test-network-k8s/network b/test-network-k8s/network index 6611d8c4..8c461b5d 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -28,44 +28,45 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.5 -context FABRIC_CA_VERSION 1.5 +context FABRIC_VERSION 2.5 +context FABRIC_CA_VERSION 1.5 -context CLUSTER_RUNTIME kind # or k3s for Rancher -context CONTAINER_CLI docker # or nerdctl for containerd -context CONTAINER_NAMESPACE "" # or "--namespace k8s.io" for containerd / nerdctl +context CLUSTER_RUNTIME kind # or k3s for Rancher +context CONTAINER_CLI docker # or nerdctl for containerd +context CONTAINER_NAMESPACE "" # or "--namespace k8s.io" for containerd / nerdctl -context FABRIC_CONTAINER_REGISTRY ghcr.io/hyperledger -context FABRIC_PEER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION} -context COUCHDB_VERSION 3.4.2 -context NETWORK_NAME test-network -context CLUSTER_NAME kind -context KUBE_NAMESPACE ${NETWORK_NAME} -context NS ${KUBE_NAMESPACE} -context ORG0_NS ${NS} -context ORG1_NS ${NS} -context ORG2_NS ${NS} -context DOMAIN localho.st -context CHANNEL_NAME mychannel -context ORDERER_TYPE raft # or bft for BFT Orderer (for Fabric v3.0+) -context ORDERER_TIMEOUT 10s # see https://github.com/hyperledger/fabric/issues/3372 -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 K8S_CHAINCODE_BUILDER_IMAGE ghcr.io/hyperledger-labs/fabric-builder-k8s/k8s-fabric-peer -context K8S_CHAINCODE_BUILDER_VERSION 0.15.1 # For Fabric v2.5+, 0.11.0 or later should be specified +context FABRIC_CONTAINER_REGISTRY ghcr.io/hyperledger +context FABRIC_PEER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION} +context THIRD_PARTY_CONTAINER_REGISTRY docker.io # or a suitable alternative, e.g. quay.io/lib +context COUCHDB_VERSION 3.4.2 +context NETWORK_NAME test-network +context CLUSTER_NAME kind +context KUBE_NAMESPACE ${NETWORK_NAME} +context NS ${KUBE_NAMESPACE} +context ORG0_NS ${NS} +context ORG1_NS ${NS} +context ORG2_NS ${NS} +context DOMAIN localho.st +context CHANNEL_NAME mychannel +context ORDERER_TYPE raft # or bft for BFT Orderer (for Fabric v3.0+) +context ORDERER_TIMEOUT 10s # see https://github.com/hyperledger/fabric/issues/3372 +context TEMP_DIR ${PWD}/build +context CHAINCODE_BUILDER ccaas +context K8S_CHAINCODE_BUILDER_IMAGE ghcr.io/hyperledger-labs/fabric-builder-k8s/k8s-fabric-peer +context K8S_CHAINCODE_BUILDER_VERSION 0.15.1 # For Fabric v2.5+, 0.11.0 or later should be specified -context LOG_FILE network.log -context DEBUG_FILE network-debug.log -context LOG_ERROR_LINES 2 -context LOCAL_REGISTRY_NAME kind-registry -context LOCAL_REGISTRY_INTERFACE 127.0.0.1 -context LOCAL_REGISTRY_PORT 5000 -context STAGE_DOCKER_IMAGES false -context NGINX_HTTP_PORT 80 -context NGINX_HTTPS_PORT 443 +context LOG_FILE network.log +context DEBUG_FILE network-debug.log +context LOG_ERROR_LINES 2 +context LOCAL_REGISTRY_NAME kind-registry +context LOCAL_REGISTRY_INTERFACE 127.0.0.1 +context LOCAL_REGISTRY_PORT 5000 +context STAGE_DOCKER_IMAGES false +context NGINX_HTTP_PORT 80 +context NGINX_HTTPS_PORT 443 -context RCAADMIN_USER rcaadmin -context RCAADMIN_PASS rcaadminpw +context RCAADMIN_USER rcaadmin +context RCAADMIN_PASS rcaadminpw function print_help() { set +x diff --git a/test-network-k8s/scripts/cluster.sh b/test-network-k8s/scripts/cluster.sh index 38c648bb..c2bed17a 100644 --- a/test-network-k8s/scripts/cluster.sh +++ b/test-network-k8s/scripts/cluster.sh @@ -44,10 +44,10 @@ function pull_docker_images() { $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${FABRIC_CONTAINER_REGISTRY}/fabric-ca:$FABRIC_CA_VERSION $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer:$FABRIC_VERSION $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${FABRIC_PEER_IMAGE} - $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} couchdb:$COUCHDB_VERSION + $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${THIRD_PARTY_CONTAINER_REGISTRY}/couchdb:$COUCHDB_VERSION $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ghcr.io/hyperledger/fabric-rest-sample:latest - $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} redis:6.2.5 + $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${THIRD_PARTY_CONTAINER_REGISTRY}/redis:6.2.5 pop_fn } diff --git a/test-network-k8s/scripts/kind.sh b/test-network-k8s/scripts/kind.sh index 33c188ba..d84a7e6b 100755 --- a/test-network-k8s/scripts/kind.sh +++ b/test-network-k8s/scripts/kind.sh @@ -82,10 +82,10 @@ function kind_load_docker_images() { kind load docker-image ${FABRIC_CONTAINER_REGISTRY}/fabric-ca:$FABRIC_CA_VERSION kind load docker-image ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer:$FABRIC_VERSION kind load docker-image ${FABRIC_PEER_IMAGE} - kind load docker-image couchdb:$COUCHDB_VERSION + kind load docker-image ${THIRD_PARTY_CONTAINER_REGISTRY}/couchdb:$COUCHDB_VERSION kind load docker-image ghcr.io/hyperledger/fabric-rest-sample:latest - kind load docker-image redis:6.2.5 + kind load docker-image ${THIRD_PARTY_CONTAINER_REGISTRY}/redis:6.2.5 pop_fn } @@ -105,7 +105,7 @@ function launch_docker_registry() { --restart always \ --name "${reg_name}" \ --publish "${reg_interface}:${reg_port}:5000" \ - registry:2 + ${THIRD_PARTY_CONTAINER_REGISTRY}/registry:2 fi # connect the registry to the cluster network