update latest version in deployer config map template (#193)

MuthuSundaravadivel · web-flow · commit 81a5d4ab0272 · 2024-05-31T10:55:58.000-04:00
Signed-off-by: MuthuSundaravadivel &lt;muthu.infoavc@gmail.com&gt;
diff --git a/defaultconfig/console/console.go b/defaultconfig/console/console.go
@@ -27,10 +27,10 @@ func GetImages() *deployer.ConsoleImages {
 		ConsoleInitImage:   "registry.access.redhat.com/ubi8/ubi-minimal",
 		ConsoleInitTag:     "latest",
 		ConfigtxlatorImage: "hyperledger/fabric-tools",
-		ConfigtxlatorTag:   "2.2.5",
+		ConfigtxlatorTag:   "2.5.8",
 		DeployerImage:      "ghcr.io/ibm-blockchain/fabric-deployer",
 		DeployerTag:        "latest",
 		CouchDBImage:       "couchdb",
-		CouchDBTag:         "3.2.2",
+		CouchDBTag:         "3.3.3",
 	}
 }
diff --git a/definitions/console/deployer-configmap.yaml b/definitions/console/deployer-configmap.yaml
@@ -45,37 +45,37 @@ data:
     imagePullSecret: ""
     versions:
       ca:
-        1.5.3-1:
+        1.5.11-1:
           default: true
-          version: 1.5.3-1
+          version: 1.5.11-1
           image:
             caInitImage: registry.access.redhat.com/ubi8/ubi-minimal
             caInitTag: latest
             caImage: hyperledger/fabric-ca
-            caTag: 1.5.3
+            caTag: 1.5.11
 
       peer:
-        2.4.3-1:
+        2.5.8-1:
           default: true
-          version: 2.4.3-1
+          version: 2.5.8-1
           image:
             peerInitImage: registry.access.redhat.com/ubi8/ubi-minimal
             peerInitTag: latest
             peerImage: hyperledger/fabric-peer
-            peerTag: 2.4.3
+            peerTag: 2.5.8
             couchdbImage: couchdb
-            couchdbTag: 3.2.2
+            couchdbTag: 3.3.3
             grpcwebImage: ghcr.io/hyperledger-labs/grpc-web
             grpcwebTag: latest
       orderer:
-        2.4.3-1:
+        2.5.8-1:
           default: true
-          version: 2.4.3-1
+          version: 2.5.8-1
           image:
             ordererInitImage: registry.access.redhat.com/ubi8/ubi-minimal
             ordererInitTag: latest
             ordererImage: hyperledger/fabric-orderer
-            ordererTag: 2.4.3
+            ordererTag: 2.5.8
             grpcwebImage: ghcr.io/hyperledger-labs/grpc-web
             grpcwebTag: latest
 
diff --git 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.11"
+	FabricVersion      = "2.2.15"
+	FabricVersion24    = "2.5.8"
 	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
@@ -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.11"
+	FabricVersion   = "2.5.8"
 )
 
 func getDefaultVersions() *deployer.Versions {
 	return &deployer.Versions{
 		CA: map[string]deployer.VersionCA{
-			"1.5.3-1": {
+			"1.5.11-1": {
 				Default: true,
-				Version: "1.5.3-1",
+				Version: "1.5.11-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.8-1": {
 				Default: true,
-				Version: "2.4.3-1",
+				Version: "2.5.8-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.8-1": {
 				Default: true,
-				Version: "2.4.3-1",
+				Version: "2.5.8-1",
 				Image: deployer.OrdererImages{
 					OrdererInitImage: InitImage,
 					OrdererInitTag:   LatestTag,
diff --git 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.8")
+FABRIC_CA_VERSION   := env_var_or_default("TEST_NETWORK_FABRIC_CA_VERSION", "1.5.11")
 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
@@ -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.8
+FABRIC_CA_VERSION=1.5.11
 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
@@ -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.8
+FABRIC_CA_VERSION=1.5.11
 
 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
@@ -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.8
+context FABRIC_CA_VERSION         1.5.11
 
 context CLUSTER_RUNTIME           kind                  # or k3s for Rancher
 context CONTAINER_CLI             docker                # or nerdctl for containerd
@@ -85,7 +85,7 @@ context INIT_IMAGE_LABEL          latest
 context GRPCWEB_IMAGE             ghcr.io/hyperledger-labs/grpc-web
 context GRPCWEB_IMAGE_LABEL       latest
 context COUCHDB_IMAGE             couchdb
-context COUCHDB_IMAGE_LABEL       3.2.2
+context COUCHDB_IMAGE_LABEL       3.3.3
 context CONSOLE_IMAGE             ghcr.io/hyperledger-labs/fabric-console
 context CONSOLE_IMAGE_LABEL       latest
 context DEPLOYER_IMAGE            ghcr.io/ibm-blockchain/fabric-deployer
diff --git a/testdata/deployercm/deployer-configmap.yaml b/testdata/deployercm/deployer-configmap.yaml
@@ -66,7 +66,7 @@ data:
             peerImage: fabric-peer
             peerTag: latest
             couchdbImage: fabric-couchdb
-            couchdbTag: 3.2.2
+            couchdbTag: 3.3.3
             grpcwebImage: fabric-grpcweb
             grpcwebTag: latest
 

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,10 @@ func GetImages() *deployer.ConsoleImages {`
`27`	`27`	`ConsoleInitImage: "registry.access.redhat.com/ubi8/ubi-minimal",`
`28`	`28`	`ConsoleInitTag: "latest",`
`29`	`29`	`ConfigtxlatorImage: "hyperledger/fabric-tools",`
`30`		`- ConfigtxlatorTag: "2.2.5",`
	`30`	`+ ConfigtxlatorTag: "2.5.8",`
`31`	`31`	`DeployerImage: "ghcr.io/ibm-blockchain/fabric-deployer",`
`32`	`32`	`DeployerTag: "latest",`
`33`	`33`	`CouchDBImage: "couchdb",`
`34`		`- CouchDBTag: "3.2.2",`
	`34`	`+ CouchDBTag: "3.3.3",`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ function destroyCluster() {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`# fabric CLI binaries + config`
`49`		`-FABRIC_VERSION=2.5.0-beta`
`50`		`-FABRIC_CA_VERSION=1.5.6-beta3`
	`49`	`+FABRIC_VERSION=2.5.8`
	`50`	`+FABRIC_CA_VERSION=1.5.11`
`51`	`51`
`52`	`52`	`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`
`53`	`53`	`export PATH=${PWD}/bin:$PATH`