test-network-k8s: bump k8s-builder and couchdb

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
hyperledger · Jun 4, 2024 · e4af8fe · e4af8fe
1 parent 0ed3458
commit e4af8fe
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/test-network-k8s/kube/org1/org1-peer1.yaml b/test-network-k8s/kube/org1/org1-peer1.yaml
@@ -95,7 +95,7 @@ spec:
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
         - name: couchdb
-          image: couchdb:3.2.1
+          image: couchdb:${COUCHDB_VERSION}
           imagePullPolicy: IfNotPresent
           env:
             - name: "COUCHDB_USER"

diff --git a/test-network-k8s/kube/org1/org1-peer2.yaml b/test-network-k8s/kube/org1/org1-peer2.yaml
@@ -96,7 +96,7 @@ spec:
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
         - name: couchdb
-          image: couchdb:3.2.1
+          image: couchdb:${COUCHDB_VERSION}
           imagePullPolicy: IfNotPresent
           env:
             - name: "COUCHDB_USER"

diff --git a/test-network-k8s/kube/org2/org2-peer1.yaml b/test-network-k8s/kube/org2/org2-peer1.yaml
@@ -95,7 +95,7 @@ spec:
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
         - name: couchdb
-          image: couchdb:3.2.1
+          image: couchdb:${COUCHDB_VERSION}
           imagePullPolicy: IfNotPresent
           env:
             - name: "COUCHDB_USER"

diff --git a/test-network-k8s/kube/org2/org2-peer2.yaml b/test-network-k8s/kube/org2/org2-peer2.yaml
@@ -94,7 +94,7 @@ spec:
               mountPath: /var/hyperledger/fabric/config/tls
               readOnly: true
         - name: couchdb
-          image: couchdb:3.2.1
+          image: couchdb:${COUCHDB_VERSION}
           imagePullPolicy: IfNotPresent
           env:
             - name: "COUCHDB_USER"

diff --git a/test-network-k8s/network b/test-network-k8s/network
@@ -37,6 +37,7 @@ context CONTAINER_NAMESPACE           ""                    # or "--namespace k8
 
 context FABRIC_CONTAINER_REGISTRY     hyperledger
 context FABRIC_PEER_IMAGE             ${FABRIC_CONTAINER_REGISTRY}/fabric-peer:${FABRIC_VERSION}
+context COUCHDB_VERSION               3.3.3
 context NETWORK_NAME                  test-network
 context CLUSTER_NAME                  kind
 context KUBE_NAMESPACE                ${NETWORK_NAME}
@@ -50,7 +51,7 @@ context ORDERER_TIMEOUT               10s                   # see https://github
 context TEMP_DIR                      ${PWD}/build
 context CHAINCODE_BUILDER             ccaas                 # see https://github.com/hyperledgendary/fabric-builder-k8s/blob/main/docs/TEST_NETWORK_K8S.md
 context K8S_CHAINCODE_BUILDER_IMAGE   ghcr.io/hyperledger-labs/fabric-builder-k8s/k8s-fabric-peer
-context K8S_CHAINCODE_BUILDER_VERSION 0.11.0 # For Fabric v2.5+, 0.11.0 or later should be specified
+context K8S_CHAINCODE_BUILDER_VERSION 0.14.0 # For Fabric v2.5+, 0.11.0 or later should be specified
 
 context LOG_FILE                      network.log
 context DEBUG_FILE                    network-debug.log

diff --git a/test-network-k8s/scripts/cluster.sh b/test-network-k8s/scripts/cluster.sh
@@ -44,7 +44,7 @@ function pull_docker_images() {
   $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${FABRIC_CONTAINER_REGISTRY}/fabric-ca:$FABRIC_CA_VERSION
   $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer:$FABRIC_VERSION
   $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ${FABRIC_PEER_IMAGE}
-  $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} couchdb:3.2.1
+  $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} couchdb:$COUCHDB_VERSION
 
   $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} ghcr.io/hyperledger/fabric-rest-sample:latest
   $CONTAINER_CLI pull ${CONTAINER_NAMESPACE} redis:6.2.5

diff --git a/test-network-k8s/scripts/kind.sh b/test-network-k8s/scripts/kind.sh
@@ -66,7 +66,7 @@ function kind_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_PEER_IMAGE}
-  kind load docker-image couchdb:3.2.1
+  kind load docker-image couchdb:$COUCHDB_VERSION
 
   kind load docker-image ghcr.io/hyperledger/fabric-rest-sample:latest
   kind load docker-image redis:6.2.5