From 0137896a54e14702898f5b1cd20d286d06f8b925 Mon Sep 17 00:00:00 2001 From: Sam Yuan Date: Sat, 19 Feb 2022 19:39:29 +0800 Subject: [PATCH] impl for couchdb supports in test0network8s as hardcode Signed-off-by: Sam Yuan --- .../kube/org1/org1-peer1-couchdb.yaml | 43 +++++++++++++++++++ test-network-k8s/kube/org1/org1-peer1.yaml | 5 ++- .../kube/org1/org1-peer2-couchdb.yaml | 43 +++++++++++++++++++ test-network-k8s/kube/org1/org1-peer2.yaml | 4 ++ .../kube/org2/org2-peer1-couchdb.yaml | 43 +++++++++++++++++++ test-network-k8s/kube/org2/org2-peer1.yaml | 4 ++ .../kube/org2/org2-peer2-couchdb.yaml | 43 +++++++++++++++++++ test-network-k8s/kube/org2/org2-peer2.yaml | 4 ++ test-network-k8s/scripts/kind.sh | 1 + test-network-k8s/scripts/test_network.sh | 12 +++++- 10 files changed, 200 insertions(+), 2 deletions(-) create mode 100644 test-network-k8s/kube/org1/org1-peer1-couchdb.yaml create mode 100644 test-network-k8s/kube/org1/org1-peer2-couchdb.yaml create mode 100644 test-network-k8s/kube/org2/org2-peer1-couchdb.yaml create mode 100644 test-network-k8s/kube/org2/org2-peer2-couchdb.yaml diff --git a/test-network-k8s/kube/org1/org1-peer1-couchdb.yaml b/test-network-k8s/kube/org1/org1-peer1-couchdb.yaml new file mode 100644 index 00000000..c9e61944 --- /dev/null +++ b/test-network-k8s/kube/org1/org1-peer1-couchdb.yaml @@ -0,0 +1,43 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# +--- +apiVersion: v1 +kind: Service +metadata: + name: org1peer1couchdb +spec: + selector: + app: org1peer1couchdb + ports: + - name: couchport + port: 5984 + targetPort: 5984 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: org1peer1couchdb +spec: + replicas: 1 + selector: + matchLabels: + app: org1peer1couchdb + template: + metadata: + labels: + app: org1peer1couchdb + spec: + containers: + - name: couchdb + image: couchdb:3 + imagePullPolicy: IfNotPresent + env: + - name: "COUCHDB_USER" + value: "admin" + - name: "COUCHDB_PASSWORD" + value: "adminpw" + ports: + - containerPort: 5984 \ No newline at end of file diff --git a/test-network-k8s/kube/org1/org1-peer1.yaml b/test-network-k8s/kube/org1/org1-peer1.yaml index a1eb6cc5..407b8e57 100644 --- a/test-network-k8s/kube/org1/org1-peer1.yaml +++ b/test-network-k8s/kube/org1/org1-peer1.yaml @@ -51,7 +51,10 @@ data: CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org1-peer1.org1.example.com CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org1-peer1.org1.example.com/snapshots CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org1peer1\"}" - + CORE_LEDGER_STATE_STATEDATABASE: CouchDB + CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: org1peer1couchdb:5984 + CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin + CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw --- apiVersion: apps/v1 kind: Deployment diff --git a/test-network-k8s/kube/org1/org1-peer2-couchdb.yaml b/test-network-k8s/kube/org1/org1-peer2-couchdb.yaml new file mode 100644 index 00000000..a950008f --- /dev/null +++ b/test-network-k8s/kube/org1/org1-peer2-couchdb.yaml @@ -0,0 +1,43 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# +--- +apiVersion: v1 +kind: Service +metadata: + name: org1peer2couchdb +spec: + selector: + app: org1peer2couchdb + ports: + - name: couchport + port: 5984 + targetPort: 5984 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: org1peer2couchdb +spec: + replicas: 1 + selector: + matchLabels: + app: org1peer2couchdb + template: + metadata: + labels: + app: org1peer2couchdb + spec: + containers: + - name: couchdb + image: couchdb:3 + imagePullPolicy: IfNotPresent + env: + - name: "COUCHDB_USER" + value: "admin" + - name: "COUCHDB_PASSWORD" + value: "adminpw" + ports: + - containerPort: 5984 \ No newline at end of file diff --git a/test-network-k8s/kube/org1/org1-peer2.yaml b/test-network-k8s/kube/org1/org1-peer2.yaml index c86b707b..dc8062f7 100644 --- a/test-network-k8s/kube/org1/org1-peer2.yaml +++ b/test-network-k8s/kube/org1/org1-peer2.yaml @@ -52,6 +52,10 @@ data: CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org1-peer2.org1.example.com CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org1-peer2.org1.example.com/snapshots CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org1peer2\"}" + CORE_LEDGER_STATE_STATEDATABASE: CouchDB + CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: org1peer2couchdb:5984 + CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin + CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw --- apiVersion: apps/v1 kind: Deployment diff --git a/test-network-k8s/kube/org2/org2-peer1-couchdb.yaml b/test-network-k8s/kube/org2/org2-peer1-couchdb.yaml new file mode 100644 index 00000000..43c86bf5 --- /dev/null +++ b/test-network-k8s/kube/org2/org2-peer1-couchdb.yaml @@ -0,0 +1,43 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# +--- +apiVersion: v1 +kind: Service +metadata: + name: org2peer1couchdb +spec: + selector: + app: org2peer1couchdb + ports: + - name: couchport + port: 5984 + targetPort: 5984 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: org2peer1couchdb +spec: + replicas: 1 + selector: + matchLabels: + app: org2peer1couchdb + template: + metadata: + labels: + app: org2peer1couchdb + spec: + containers: + - name: couchdb + image: couchdb:3 + imagePullPolicy: IfNotPresent + env: + - name: "COUCHDB_USER" + value: "admin" + - name: "COUCHDB_PASSWORD" + value: "adminpw" + ports: + - containerPort: 5984 \ No newline at end of file diff --git a/test-network-k8s/kube/org2/org2-peer1.yaml b/test-network-k8s/kube/org2/org2-peer1.yaml index c5c89c8d..955b47e4 100644 --- a/test-network-k8s/kube/org2/org2-peer1.yaml +++ b/test-network-k8s/kube/org2/org2-peer1.yaml @@ -51,6 +51,10 @@ data: CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org2-peer1.org2.example.com CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org2-peer1.org2.example.com/snapshots CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org2peer1\"}" + CORE_LEDGER_STATE_STATEDATABASE: CouchDB + CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: org2peer1couchdb:5984 + CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin + CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw --- apiVersion: apps/v1 kind: Deployment diff --git a/test-network-k8s/kube/org2/org2-peer2-couchdb.yaml b/test-network-k8s/kube/org2/org2-peer2-couchdb.yaml new file mode 100644 index 00000000..9bd855f7 --- /dev/null +++ b/test-network-k8s/kube/org2/org2-peer2-couchdb.yaml @@ -0,0 +1,43 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# +--- +apiVersion: v1 +kind: Service +metadata: + name: org2peer2couchdb +spec: + selector: + app: org2peer2couchdb + ports: + - name: couchport + port: 5984 + targetPort: 5984 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: org2peer2couchdb +spec: + replicas: 1 + selector: + matchLabels: + app: org2peer2couchdb + template: + metadata: + labels: + app: org2peer2couchdb + spec: + containers: + - name: couchdb + image: couchdb:3 + imagePullPolicy: IfNotPresent + env: + - name: "COUCHDB_USER" + value: "admin" + - name: "COUCHDB_PASSWORD" + value: "adminpw" + ports: + - containerPort: 5984 \ No newline at end of file diff --git a/test-network-k8s/kube/org2/org2-peer2.yaml b/test-network-k8s/kube/org2/org2-peer2.yaml index 30fb4da3..1c469e1f 100644 --- a/test-network-k8s/kube/org2/org2-peer2.yaml +++ b/test-network-k8s/kube/org2/org2-peer2.yaml @@ -51,6 +51,10 @@ data: CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org2-peer2.org2.example.com CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org2-peer2.org2.example.com/snapshots CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org2peer2\"}" + CORE_LEDGER_STATE_STATEDATABASE: CouchDB + CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: org2peer2couchdb:5984 + CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin + CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw --- apiVersion: apps/v1 kind: Deployment diff --git a/test-network-k8s/scripts/kind.sh b/test-network-k8s/scripts/kind.sh index de0ae3e2..f63604bc 100755 --- a/test-network-k8s/scripts/kind.sh +++ b/test-network-k8s/scripts/kind.sh @@ -25,6 +25,7 @@ function load_docker_images() { kind load docker-image ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:$FABRIC_VERSION 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 pop_fn } diff --git a/test-network-k8s/scripts/test_network.sh b/test-network-k8s/scripts/test_network.sh index 70094fff..13924938 100755 --- a/test-network-k8s/scripts/test_network.sh +++ b/test-network-k8s/scripts/test_network.sh @@ -209,6 +209,7 @@ function network_up() { # Test Network create_local_MSP + create_couchdb launch_orderers launch_peers @@ -252,4 +253,13 @@ function scrub_org_volumes() { function network_down() { stop_services scrub_org_volumes -} \ No newline at end of file +} + +function create_couchdb() { + push_fn "Launching couchdb" + launch ./kube/org1/org1-peer1-couchdb.yaml + launch ./kube/org1/org1-peer2-couchdb.yaml + launch ./kube/org2/org2-peer1-couchdb.yaml + launch ./kube/org2/org2-peer2-couchdb.yaml + pop_fn +}