From 2d5541e117bb30e64e910b7d17a89bf1cf8d349c Mon Sep 17 00:00:00 2001 From: MuthuSundaravadivel Date: Thu, 16 May 2024 22:41:27 +0530 Subject: [PATCH] update latest version in deployer config map template Signed-off-by: MuthuSundaravadivel --- integration/images.go | 8 ++++---- operatorconfig/versions.go | 18 +++++++++--------- sample-network-multi-org/justfile | 4 ++-- sample-network-multi-org/scripts/check.sh | 4 ++-- sample-network-multi-org/scripts/test-e2e.sh | 4 ++-- sample-network/network | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/integration/images.go b/integration/images.go index df87eea7..3cc65957 100644 --- a/integration/images.go +++ b/integration/images.go @@ -19,9 +19,9 @@ package integration const ( - FabricCAVersion = "1.5.3" - FabricVersion = "2.2.5" - FabricVersion24 = "2.4.3" + FabricCAVersion = "1.5.10" + FabricVersion = "2.2.15" + FabricVersion24 = "2.5.7" InitImage = "registry.access.redhat.com/ubi8/ubi-minimal" InitTag = "latest" CaImage = "hyperledger/fabric-ca" @@ -35,7 +35,7 @@ const ( ConfigtxlatorImage = "hyperledger/fabric-tools" ConfigtxlatorTag = FabricVersion24 CouchdbImage = "couchdb" - CouchdbTag = "3.2.2" + CouchdbTag = "3.3.3" GrpcwebImage = "ghcr.io/hyperledger-labs/grpc-web" GrpcwebTag = "latest" ConsoleImage = "ghcr.io/hyperledger-labs/fabric-console" diff --git a/operatorconfig/versions.go b/operatorconfig/versions.go index 546cc4f7..2a10d3ed 100644 --- a/operatorconfig/versions.go +++ b/operatorconfig/versions.go @@ -23,16 +23,16 @@ import "github.com/IBM-Blockchain/fabric-operator/pkg/apis/deployer" const ( InitImage = "registry.access.redhat.com/ubi8/ubi-minimal" LatestTag = "latest" - FabricCAVersion = "1.5.3" - FabricVersion = "2.4.3" + FabricCAVersion = "1.5.10" + FabricVersion = "2.5.7" ) func getDefaultVersions() *deployer.Versions { return &deployer.Versions{ CA: map[string]deployer.VersionCA{ - "1.5.3-1": { + "1.5.10-1": { Default: true, - Version: "1.5.3-1", + Version: "1.5.10-1", Image: deployer.CAImages{ CAInitImage: InitImage, CAInitTag: LatestTag, @@ -42,25 +42,25 @@ func getDefaultVersions() *deployer.Versions { }, }, Peer: map[string]deployer.VersionPeer{ - "2.4.3-1": { + "2.5.7-1": { Default: true, - Version: "2.4.3-1", + Version: "2.5.7-1", Image: deployer.PeerImages{ PeerInitImage: InitImage, PeerInitTag: LatestTag, PeerImage: "hyperledger/fabric-peer", PeerTag: FabricVersion, CouchDBImage: "couchdb", - CouchDBTag: "3.2.2", + CouchDBTag: "3.3.3", GRPCWebImage: "ghcr.io/hyperledger-labs/grpc-web", GRPCWebTag: LatestTag, }, }, }, Orderer: map[string]deployer.VersionOrderer{ - "2.4.3-1": { + "2.5.7-1": { Default: true, - Version: "2.4.3-1", + Version: "2.5.7-1", Image: deployer.OrdererImages{ OrdererInitImage: InitImage, OrdererInitTag: LatestTag, diff --git a/sample-network-multi-org/justfile b/sample-network-multi-org/justfile index f2ab07c8..cad68b3e 100644 --- a/sample-network-multi-org/justfile +++ b/sample-network-multi-org/justfile @@ -48,8 +48,8 @@ check: CLUSTER_NAME := env_var_or_default("TEST_NETWORK_CLUSTER_NAME", "kind") NAMESPACE := env_var_or_default("TEST_NETWORK_NAMESPACE", "test-network") OPERATOR_IMAGE := env_var_or_default("TEST_NETWORK_OPERATOR_IMAGE", "ghcr.io/hyperledger-labs/fabric-operator:1.0") -FABRIC_VERSION := env_var_or_default("TEST_NETWORK_FABRIC_VERSION", "2.5.0-beta") -FABRIC_CA_VERSION := env_var_or_default("TEST_NETWORK_FABRIC_CA_VERSION", "1.5.6-beta3") +FABRIC_VERSION := env_var_or_default("TEST_NETWORK_FABRIC_VERSION", "2.5.7") +FABRIC_CA_VERSION := env_var_or_default("TEST_NETWORK_FABRIC_CA_VERSION", "1.5.10") CA_IMAGE := env_var_or_default("TEST_NETWORK_CA_IMAGE", "hyperledger/fabric-ca") CA_IMAGE_TAG := env_var_or_default("TEST_NETWORK_CA_IMAGE_TAG", FABRIC_CA_VERSION) PEER_IMAGE := env_var_or_default("TEST_NETWORK_PEER_IMAGE", "ghcr.io/hyperledger-labs/k8s-fabric-peer") diff --git a/sample-network-multi-org/scripts/check.sh b/sample-network-multi-org/scripts/check.sh index 6349cda6..d7563d51 100755 --- a/sample-network-multi-org/scripts/check.sh +++ b/sample-network-multi-org/scripts/check.sh @@ -88,8 +88,8 @@ else echo -e "${SUCCESS} jq found:\t\t$(cat /tmp/cmdpath)" fi -FABRIC_VERSION=2.5.0-beta -FABRIC_CA_VERSION=1.5.6-beta3 +FABRIC_VERSION=2.5.7 +FABRIC_CA_VERSION=1.5.10 if ! command -v peer &> /tmp/cmdpath then echo "${WARN} Please install the Fabric CLI binaries; suggested install commands:" diff --git a/sample-network-multi-org/scripts/test-e2e.sh b/sample-network-multi-org/scripts/test-e2e.sh index 3c873792..edbdf79a 100755 --- a/sample-network-multi-org/scripts/test-e2e.sh +++ b/sample-network-multi-org/scripts/test-e2e.sh @@ -46,8 +46,8 @@ function destroyCluster() { } # fabric CLI binaries + config -FABRIC_VERSION=2.5.0-beta -FABRIC_CA_VERSION=1.5.6-beta3 +FABRIC_VERSION=2.5.7 +FABRIC_CA_VERSION=1.5.10 curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary --fabric-version $FABRIC_VERSION --ca-version $FABRIC_CA_VERSION export PATH=${PWD}/bin:$PATH diff --git a/sample-network/network b/sample-network/network index 042d935f..5f6638c8 100755 --- a/sample-network/network +++ b/sample-network/network @@ -31,8 +31,8 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.4.4 -context FABRIC_CA_VERSION 1.5.5 +context FABRIC_VERSION 2.5.7 +context FABRIC_CA_VERSION 1.5.10 context CLUSTER_RUNTIME kind # or k3s for Rancher context CONTAINER_CLI docker # or nerdctl for containerd