diff --git a/SUT/fabric/kube/org1/org1-peer1-couchdb.yaml b/SUT/fabric/kube/org1/org1-peer1-couchdb.yaml new file mode 100644 index 0000000..c9e6194 --- /dev/null +++ b/SUT/fabric/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/SUT/fabric/kube/org1/org1-peer1.yaml b/SUT/fabric/kube/org1/org1-peer1.yaml index 23ad3c3..3c15aa2 100644 --- a/SUT/fabric/kube/org1/org1-peer1.yaml +++ b/SUT/fabric/kube/org1/org1-peer1.yaml @@ -29,6 +29,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 CORE_METRICS_PROVIDER: prometheus + 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/SUT/fabric/kube/org1/org1-peer2-couchdb.yaml b/SUT/fabric/kube/org1/org1-peer2-couchdb.yaml new file mode 100644 index 0000000..a950008 --- /dev/null +++ b/SUT/fabric/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/SUT/fabric/kube/org1/org1-peer2.yaml b/SUT/fabric/kube/org1/org1-peer2.yaml index 2b5da27..987a855 100644 --- a/SUT/fabric/kube/org1/org1-peer2.yaml +++ b/SUT/fabric/kube/org1/org1-peer2.yaml @@ -29,7 +29,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 CORE_METRICS_PROVIDER: prometheus - + 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/SUT/fabric/kube/org2/org2-peer1-couchdb.yaml b/SUT/fabric/kube/org2/org2-peer1-couchdb.yaml new file mode 100644 index 0000000..43c86bf --- /dev/null +++ b/SUT/fabric/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/SUT/fabric/kube/org2/org2-peer1.yaml b/SUT/fabric/kube/org2/org2-peer1.yaml index ab263a3..84ab19d 100644 --- a/SUT/fabric/kube/org2/org2-peer1.yaml +++ b/SUT/fabric/kube/org2/org2-peer1.yaml @@ -29,7 +29,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 CORE_METRICS_PROVIDER: prometheus - + 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/SUT/fabric/kube/org2/org2-peer2-couchdb.yaml b/SUT/fabric/kube/org2/org2-peer2-couchdb.yaml new file mode 100644 index 0000000..9bd855f --- /dev/null +++ b/SUT/fabric/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/SUT/fabric/kube/org2/org2-peer2.yaml b/SUT/fabric/kube/org2/org2-peer2.yaml index 7f4a17a..366181d 100644 --- a/SUT/fabric/kube/org2/org2-peer2.yaml +++ b/SUT/fabric/kube/org2/org2-peer2.yaml @@ -29,7 +29,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 CORE_METRICS_PROVIDER: prometheus - + 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/SUT/fabric/networkdeploy.sh b/SUT/fabric/networkdeploy.sh index c78d8e8..89392d1 100755 --- a/SUT/fabric/networkdeploy.sh +++ b/SUT/fabric/networkdeploy.sh @@ -26,6 +26,7 @@ function network_up() { # Test Network echo "Step 4/4, set up ECert CA" create_local_MSP + couchdb launch_orderers launch_peers @@ -459,4 +460,15 @@ metadata: EOF nohup kubectl port-forward svc/simplest-query 16686 & echo "Complete restart jaeger" +} + +function couchdb() { + echo "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 + + echo "Complete Launching couchdb" } \ No newline at end of file