From 5ad54564db06d56dc826fac4a035be657710603d Mon Sep 17 00:00:00 2001 From: James Taylor Date: Mon, 25 Apr 2022 16:18:52 +0100 Subject: [PATCH] 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 --- test-network-k8s/kube/org1/org1-peer1.yaml | 2 +- test-network-k8s/kube/org1/org1-peer2.yaml | 2 +- test-network-k8s/kube/org2/org2-peer1.yaml | 2 +- test-network-k8s/kube/org2/org2-peer2.yaml | 2 +- test-network-k8s/network | 1 + test-network-k8s/scripts/kind.sh | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/test-network-k8s/kube/org1/org1-peer1.yaml b/test-network-k8s/kube/org1/org1-peer1.yaml index 3f64b04a..1d6a9f6c 100644 --- a/test-network-k8s/kube/org1/org1-peer1.yaml +++ b/test-network-k8s/kube/org1/org1-peer1.yaml @@ -76,7 +76,7 @@ spec: spec: containers: - name: main - image: ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION} + image: ${FABRIC_PEER_IMAGE} imagePullPolicy: IfNotPresent envFrom: - configMapRef: diff --git a/test-network-k8s/kube/org1/org1-peer2.yaml b/test-network-k8s/kube/org1/org1-peer2.yaml index 288536a8..91e46bb2 100644 --- a/test-network-k8s/kube/org1/org1-peer2.yaml +++ b/test-network-k8s/kube/org1/org1-peer2.yaml @@ -76,7 +76,7 @@ spec: spec: containers: - name: main - image: ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION} + image: ${FABRIC_PEER_IMAGE} imagePullPolicy: IfNotPresent envFrom: - configMapRef: diff --git a/test-network-k8s/kube/org2/org2-peer1.yaml b/test-network-k8s/kube/org2/org2-peer1.yaml index 89e3440b..a9569704 100644 --- a/test-network-k8s/kube/org2/org2-peer1.yaml +++ b/test-network-k8s/kube/org2/org2-peer1.yaml @@ -76,7 +76,7 @@ spec: spec: containers: - name: main - image: ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION} + image: ${FABRIC_PEER_IMAGE} imagePullPolicy: IfNotPresent envFrom: - configMapRef: diff --git a/test-network-k8s/kube/org2/org2-peer2.yaml b/test-network-k8s/kube/org2/org2-peer2.yaml index 268dde28..5c6f5b0a 100644 --- a/test-network-k8s/kube/org2/org2-peer2.yaml +++ b/test-network-k8s/kube/org2/org2-peer2.yaml @@ -75,7 +75,7 @@ spec: spec: containers: - name: main - image: ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION} + image: ${FABRIC_PEER_IMAGE} imagePullPolicy: IfNotPresent envFrom: - configMapRef: diff --git a/test-network-k8s/network b/test-network-k8s/network index 487e4617..b92f3c24 100755 --- a/test-network-k8s/network +++ b/test-network-k8s/network @@ -18,6 +18,7 @@ export CONTAINER_CLI=${CONTAINER_CLI:-docker} export FABRIC_VERSION=${TEST_NETWORK_FABRIC_VERSION:-2.4.3} export FABRIC_CA_VERSION=${TEST_NETWORK_FABRIC_CA_VERSION:-1.5.2} export FABRIC_CONTAINER_REGISTRY=${TEST_NETWORK_FABRIC_CONTAINER_REGISTRY:-hyperledger} +export FABRIC_PEER_IMAGE=${TEST_NETWORK_FABRIC_PEER_IMAGE:-${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION}} export NETWORK_NAME=${TEST_NETWORK_NAME:-test-network} export CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind} export NS=${TEST_NETWORK_KUBE_NAMESPACE:-${NETWORK_NAME}} diff --git a/test-network-k8s/scripts/kind.sh b/test-network-k8s/scripts/kind.sh index 88f01b2f..f28d64d2 100755 --- a/test-network-k8s/scripts/kind.sh +++ b/test-network-k8s/scripts/kind.sh @@ -10,7 +10,7 @@ function pull_docker_images() { docker pull ${FABRIC_CONTAINER_REGISTRY}/fabric-ca:$FABRIC_CA_VERSION docker pull ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer:$FABRIC_VERSION - docker pull ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:$FABRIC_VERSION + docker pull ${FABRIC_PEER_IMAGE} docker pull ${FABRIC_CONTAINER_REGISTRY}/fabric-tools:$FABRIC_VERSION docker pull ghcr.io/hyperledgendary/fabric-ccaas-asset-transfer-basic:latest docker pull couchdb:3.2.1 @@ -23,7 +23,7 @@ function 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_CONTAINER_REGISTRY}/fabric-peer:$FABRIC_VERSION + kind load docker-image ${FABRIC_PEER_IMAGE} kind load docker-image ${FABRIC_CONTAINER_REGISTRY}/fabric-tools:$FABRIC_VERSION kind load docker-image ghcr.io/hyperledgendary/fabric-ccaas-asset-transfer-basic:latest kind load docker-image couchdb:3.2.1