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

nit fixs (#519)

Browse source 
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>
This commit is contained in:
Sam Yuan 2021-11-02 23:43:31 +08:00 committed by GitHub
parent 6627cd6d65
commit 0a1efc45cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 62 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ from a public container registry, copying the external builders into the target
```yaml ```yaml
initContainers: initContainers:
- name: fabric-ccs-builder - name: fabric-ccs-builder
image: ghcr.io/hyperledgendary/fabric-ccs-builder image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ccs-builder
command: [sh, -c] command: [sh, -c]
args: ["cp /go/bin/* /var/hyperledger/fabric/chaincode/ccs-builder/bin/"] args: ["cp /go/bin/* /var/hyperledger/fabric/chaincode/ccs-builder/bin/"]
volumeMounts: volumeMounts:

2
test-network-k8s/kube/job-scrub-fabric-volumes.yaml
View file

@ -18,7 +18,7 @@ spec:
restartPolicy: "Never" restartPolicy: "Never"
containers: containers:
- name: main - name: main
image: busybox image: busybox:latest
command: command:
- sh - sh
- -c - -c

2
test-network-k8s/kube/org0/org0-admin-cli.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-tools:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-tools:{{FABRIC_VERSION}}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: FABRIC_CFG_PATH - name: FABRIC_CFG_PATH

2
test-network-k8s/kube/org0/org0-ecert-ca.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}}
env: env:
- name: FABRIC_CA_SERVER_CA_NAME - name: FABRIC_CA_SERVER_CA_NAME
value: "org0-ecert-ca" value: "org0-ecert-ca"

2
test-network-k8s/kube/org0/org0-orderer1.yaml
View file

@ -43,7 +43,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-orderer:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-orderer:{{FABRIC_VERSION}}
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef:

2
test-network-k8s/kube/org0/org0-orderer2.yaml
View file

@ -43,7 +43,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-orderer:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-orderer:{{FABRIC_VERSION}}
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef:

2
test-network-k8s/kube/org0/org0-orderer3.yaml
View file

@ -43,7 +43,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-orderer:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-orderer:{{FABRIC_VERSION}}
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef:

2
test-network-k8s/kube/org0/org0-tls-ca.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}}
env: env:
- name: FABRIC_CA_SERVER_CA_NAME - name: FABRIC_CA_SERVER_CA_NAME
value: "org0-tls-ca" value: "org0-tls-ca"

2
test-network-k8s/kube/org1/org1-admin-cli.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-tools:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-tools:{{FABRIC_VERSION}}
imagePullPolicy: Always imagePullPolicy: Always
env: env:
- name: FABRIC_CFG_PATH - name: FABRIC_CFG_PATH

2
test-network-k8s/kube/org1/org1-ecert-ca.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}}
env: env:
- name: FABRIC_CA_SERVER_CA_NAME - name: FABRIC_CA_SERVER_CA_NAME
value: "org1-ecert-ca" value: "org1-ecert-ca"

4
test-network-k8s/kube/org1/org1-peer1.yaml
View file

@ -46,7 +46,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}}
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef:
@ -66,7 +66,7 @@ spec:
# load the external chaincode builder into the peer image prior to peer launch. # load the external chaincode builder into the peer image prior to peer launch.
initContainers: initContainers:
- name: fabric-ccs-builder - name: fabric-ccs-builder
image: ghcr.io/hyperledgendary/fabric-ccs-builder image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ccs-builder
imagePullPolicy: Always imagePullPolicy: Always
command: [sh, -c] command: [sh, -c]
args: ["cp /go/bin/* /var/hyperledger/fabric/chaincode/ccs-builder/bin/"] args: ["cp /go/bin/* /var/hyperledger/fabric/chaincode/ccs-builder/bin/"]

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

@ -46,7 +46,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}}
imagePullPolicy: Always imagePullPolicy: Always
envFrom: envFrom:
- configMapRef: - configMapRef:

2
test-network-k8s/kube/org1/org1-tls-ca.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}}
env: env:
- name: FABRIC_CA_SERVER_CA_NAME - name: FABRIC_CA_SERVER_CA_NAME
value: "org1-tls-ca" value: "org1-tls-ca"

2
test-network-k8s/kube/org2/org2-admin-cli.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-tools:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-tools:{{FABRIC_VERSION}}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: FABRIC_CFG_PATH - name: FABRIC_CFG_PATH

2
test-network-k8s/kube/org2/org2-ecert-ca.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}}
env: env:
- name: FABRIC_CA_SERVER_CA_NAME - name: FABRIC_CA_SERVER_CA_NAME
value: "org2-ecert-ca" value: "org2-ecert-ca"

4
test-network-k8s/kube/org2/org2-peer1.yaml
View file

@ -46,7 +46,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
envFrom: envFrom:
- configMapRef: - configMapRef:
@ -66,7 +66,7 @@ spec:
# load the external chaincode builder into the peer image prior to peer launch. # load the external chaincode builder into the peer image prior to peer launch.
initContainers: initContainers:
- name: fabric-ccs-builder - name: fabric-ccs-builder
image: ghcr.io/hyperledgendary/fabric-ccs-builder image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ccs-builder
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: [sh, -c] command: [sh, -c]
args: ["cp /go/bin/* /var/hyperledger/fabric/chaincode/ccs-builder/bin/"] args: ["cp /go/bin/* /var/hyperledger/fabric/chaincode/ccs-builder/bin/"]

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

@ -46,7 +46,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-peer:{{FABRIC_VERSION}}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
envFrom: envFrom:
- configMapRef: - configMapRef:

2
test-network-k8s/kube/org2/org2-tls-ca.yaml
View file

@ -20,7 +20,7 @@ spec:
spec: spec:
containers: containers:
- name: main - name: main
image: {{FABRIC_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}} image: {{LOCAL_CONTAINER_REGISTRY}}/fabric-ca:{{FABRIC_CA_VERSION}}
env: env:
- name: FABRIC_CA_SERVER_CA_NAME - name: FABRIC_CA_SERVER_CA_NAME
value: "org2-tls-ca" value: "org2-tls-ca"

3
test-network-k8s/network
View file

@ -22,6 +22,7 @@ set -o errexit
FABRIC_VERSION=${TEST_NETWORK_FABRIC_VERSION:-2.3.2} FABRIC_VERSION=${TEST_NETWORK_FABRIC_VERSION:-2.3.2}
FABRIC_CA_VERSION=${TEST_NETWORK_FABRIC_CA_VERSION:-1.5.2} FABRIC_CA_VERSION=${TEST_NETWORK_FABRIC_CA_VERSION:-1.5.2}
LOCAL_CONTAINER_REGISTRY=localhost:5000
FABRIC_CONTAINER_REGISTRY=${TEST_NETWORK_FABRIC_CONTAINER_REGISTRY:-hyperledger} FABRIC_CONTAINER_REGISTRY=${TEST_NETWORK_FABRIC_CONTAINER_REGISTRY:-hyperledger}
NETWORK_NAME=${TEST_NETWORK_NAME:-test-network} NETWORK_NAME=${TEST_NETWORK_NAME:-test-network}
CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind} CLUSTER_NAME=${TEST_NETWORK_KIND_CLUSTER_NAME:-kind}
@ -34,7 +35,7 @@ LOCAL_REGISTRY_PORT=${TEST_NETWORK_LOCAL_REGISTRY_PORT:-5000}
NGINX_HTTP_PORT=${TEST_NETWORK_INGRESS_HTTP_PORT:-80} NGINX_HTTP_PORT=${TEST_NETWORK_INGRESS_HTTP_PORT:-80}
NGINX_HTTPS_PORT=${TEST_NETWORK_INGRESS_HTTPS_PORT:-443} NGINX_HTTPS_PORT=${TEST_NETWORK_INGRESS_HTTPS_PORT:-443}
CHAINCODE_NAME=${TEST_NETWORK_CHAINCODE_NAME:-asset-transfer-basic} CHAINCODE_NAME=${TEST_NETWORK_CHAINCODE_NAME:-asset-transfer-basic}
CHAINCODE_IMAGE=${TEST_NETWORK_CHAINCODE_IMAGE:-ghcr.io/hyperledgendary/fabric-ccaas-asset-transfer-basic} CHAINCODE_IMAGE=${TEST_NETWORK_CHAINCODE_IMAGE:-localhost:5000/fabric-ccaas-asset-transfer-basic}
CHAINCODE_LABEL=${TEST_NETWORK_CHAINCODE_LABEL:-basic_1.0} CHAINCODE_LABEL=${TEST_NETWORK_CHAINCODE_LABEL:-basic_1.0}
# todo: more complicated config, as these bleed into the yaml descriptors (sed? kustomize? helm (no)? tkn? ansible?...) or other script locations # todo: more complicated config, as these bleed into the yaml descriptors (sed? kustomize? helm (no)? tkn? ansible?...) or other script locations

2
test-network-k8s/scripts/fabric_CAs.sh
View file

@ -8,7 +8,7 @@
function launch_CA() { function launch_CA() {
local yaml=$1 local yaml=$1
cat ${yaml} \ cat ${yaml} \
| sed 's,{{FABRIC_CONTAINER_REGISTRY}},'${FABRIC_CONTAINER_REGISTRY}',g' \ | sed 's,{{LOCAL_CONTAINER_REGISTRY}},'${LOCAL_CONTAINER_REGISTRY}',g' \
| sed 's,{{FABRIC_CA_VERSION}},'${FABRIC_CA_VERSION}',g' \ | sed 's,{{FABRIC_CA_VERSION}},'${FABRIC_CA_VERSION}',g' \
| kubectl -n $NS apply -f - | kubectl -n $NS apply -f -
} }

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

@ -5,6 +5,38 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
function pull_docker_images() {
push_fn "Pulling docker images for Fabric ${FABRIC_VERSION}"
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_CONTAINER_REGISTRY}/fabric-tools:$FABRIC_VERSION
docker pull ghcr.io/hyperledgendary/fabric-ccs-builder:latest
docker pull ghcr.io/hyperledgendary/fabric-ccaas-asset-transfer-basic:latest
pop_fn
}
function push_images_to_local() {
push_fn "Push docker images to local image repository"
docker tag ${FABRIC_CONTAINER_REGISTRY}/fabric-ca:$FABRIC_CA_VERSION ${LOCAL_CONTAINER_REGISTRY}/fabric-ca:$FABRIC_CA_VERSION
docker push ${LOCAL_CONTAINER_REGISTRY}/fabric-ca:$FABRIC_CA_VERSION
docker tag ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer:$FABRIC_VERSION ${LOCAL_CONTAINER_REGISTRY}/fabric-orderer:$FABRIC_VERSION
docker push ${LOCAL_CONTAINER_REGISTRY}/fabric-orderer:$FABRIC_VERSION
docker tag ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:$FABRIC_VERSION ${LOCAL_CONTAINER_REGISTRY}/fabric-peer:$FABRIC_VERSION
docker push ${LOCAL_CONTAINER_REGISTRY}/fabric-peer:$FABRIC_VERSION
docker tag ${FABRIC_CONTAINER_REGISTRY}/fabric-tools:$FABRIC_VERSION ${LOCAL_CONTAINER_REGISTRY}/fabric-tools:$FABRIC_VERSION
docker push ${LOCAL_CONTAINER_REGISTRY}/fabric-tools:$FABRIC_VERSION
docker tag ghcr.io/hyperledgendary/fabric-ccs-builder:latest ${LOCAL_CONTAINER_REGISTRY}/fabric-ccs-builder:latest
docker push ${LOCAL_CONTAINER_REGISTRY}/fabric-ccs-builder:latest
docker tag ghcr.io/hyperledgendary/fabric-ccaas-asset-transfer-basic:latest ${LOCAL_CONTAINER_REGISTRY}/fabric-ccaas-asset-transfer-basic:latest
docker push ${LOCAL_CONTAINER_REGISTRY}/fabric-ccaas-asset-transfer-basic:latest
pop_fn
}
function apply_nginx_ingress() { function apply_nginx_ingress() {
push_fn "Launching Nginx ingress controller" push_fn "Launching Nginx ingress controller"
@ -95,11 +127,6 @@ EOF
pop_fn pop_fn
} }
function load_kind_image_plane() {
push_fn "Ensuring fabric node images"
pop_fn
}
function kind_delete() { function kind_delete() {
push_fn "Deleting KIND cluster ${CLUSTER_NAME}" push_fn "Deleting KIND cluster ${CLUSTER_NAME}"
@ -115,6 +142,9 @@ function kind_init() {
kind_create kind_create
apply_nginx_ingress apply_nginx_ingress
launch_docker_registry launch_docker_registry
pull_docker_images
push_images_to_local
} }
function kind_unkind() { function kind_unkind() {

5
test-network-k8s/scripts/test_network.sh
View file

@ -11,7 +11,7 @@
function launch() { function launch() {
local yaml=$1 local yaml=$1
cat ${yaml} \ cat ${yaml} \
| sed 's,{{FABRIC_CONTAINER_REGISTRY}},'${FABRIC_CONTAINER_REGISTRY}',g' \ | sed 's,{{LOCAL_CONTAINER_REGISTRY}},'${LOCAL_CONTAINER_REGISTRY}',g' \
| sed 's,{{FABRIC_VERSION}},'${FABRIC_VERSION}',g' \ | sed 's,{{FABRIC_VERSION}},'${FABRIC_VERSION}',g' \
| kubectl -n $NS apply -f - | kubectl -n $NS apply -f -
} }
@ -247,6 +247,9 @@ function stop_services() {
function scrub_org_volumes() { function scrub_org_volumes() {
push_fn "Scrubbing Fabric volumes" push_fn "Scrubbing Fabric volumes"
# clean job to make this function can be rerun
kubectl -n $NS delete jobs --all
# scrub all pv contents # scrub all pv contents
kubectl -n $NS create -f kube/job-scrub-fabric-volumes.yaml kubectl -n $NS create -f kube/job-scrub-fabric-volumes.yaml