fix up according to pr review comments

Signed-off-by: Sam Yuan <yy19902439@126.com>

test-network-k8s/kube/org1/org1-peer1-couchdb.yaml

@@ -1,43 +0,0 @@
-#
-# 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

test-network-k8s/kube/org1/org1-peer1.yaml

@@ -52,7 +52,8 @@ data:
   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_MAXRETRIESONSTARTUP: "20"
+  CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
   CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin
   CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw
 ---
@@ -90,6 +91,16 @@ spec:
             - name: tls-cert-volume
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
+        - name: couchdb
+          image: couchdb:3.2.1
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: "COUCHDB_USER"
+              value: "admin" 
+            - name: "COUCHDB_PASSWORD"
+              value: "adminpw"
+          ports:
+              - containerPort: 5984
       volumes:
         - name: fabric-volume
           persistentVolumeClaim:

test-network-k8s/kube/org1/org1-peer2-couchdb.yaml

@@ -1,43 +0,0 @@
-#
-# 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

test-network-k8s/kube/org1/org1-peer2.yaml

@@ -53,7 +53,8 @@ data:
   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_MAXRETRIESONSTARTUP: "20"
+  CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
   CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin
   CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw
 ---
@@ -91,6 +92,16 @@ spec:
             - name: tls-cert-volume
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
+        - name: couchdb
+          image: couchdb:3.2.1
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: "COUCHDB_USER"
+              value: "admin" 
+            - name: "COUCHDB_PASSWORD"
+              value: "adminpw"
+          ports:
+              - containerPort: 5984
       volumes:
         - name: fabric-volume
           persistentVolumeClaim:

test-network-k8s/kube/org2/org2-peer1-couchdb.yaml

@@ -1,43 +0,0 @@
-#
-# 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

test-network-k8s/kube/org2/org2-peer1.yaml

@@ -52,7 +52,8 @@ data:
   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_MAXRETRIESONSTARTUP: "20"
+  CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
   CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin
   CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw
 ---
@@ -90,6 +91,16 @@ spec:
             - name: tls-cert-volume
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
+        - name: couchdb
+          image: couchdb:3.2.1
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: "COUCHDB_USER"
+              value: "admin" 
+            - name: "COUCHDB_PASSWORD"
+              value: "adminpw"
+          ports:
+              - containerPort: 5984
       volumes:
         - name: fabric-volume
           persistentVolumeClaim:
@@ -99,7 +110,7 @@ spec:
             name: org2-config
         - name: tls-cert-volume
           secret:
-            secretName: org2-peer1-tls-cert
+            secretName: org2-peer1-tls-cert          
 ---
 apiVersion: v1
 kind: Service

test-network-k8s/kube/org2/org2-peer2-couchdb.yaml

@@ -1,43 +0,0 @@
-#
-# 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

test-network-k8s/kube/org2/org2-peer2.yaml

@@ -52,7 +52,8 @@ data:
   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_MAXRETRIESONSTARTUP: "20"
+  CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
   CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME: admin
   CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD: adminpw
 ---
@@ -90,6 +91,16 @@ spec:
             - name: tls-cert-volume
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
+        - name: couchdb
+          image: couchdb:3.2.1
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: "COUCHDB_USER"
+              value: "admin" 
+            - name: "COUCHDB_PASSWORD"
+              value: "adminpw"
+          ports:
+              - containerPort: 5984
       volumes:
         - name: fabric-volume
           persistentVolumeClaim:

test-network-k8s/scripts/kind.sh

@@ -25,7 +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
+  kind load docker-image couchdb:3.2.1
   
   pop_fn 
 }

test-network-k8s/scripts/test_network.sh

@@ -209,7 +209,6 @@ function network_up() {
 
   # Test Network
   create_local_MSP
-  create_couchdb
 
   launch_orderers
   launch_peers
@@ -254,12 +253,3 @@ function network_down() {
   stop_services
   scrub_org_volumes
 }
-
-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
-}