Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update latest version in deployer config map template #193

Merged
merged 4 commits into from
May 31, 2024
Merged

update latest version in deployer config map template #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4c6d80
update latest version in deployer config map template
MuthuSundaravadivel May 16, 2024
2d5541e
update latest version in deployer config map template
MuthuSundaravadivel May 16, 2024
e0024b9
update latest version in deployer config map template
MuthuSundaravadivel May 24, 2024
3a08a89
Merge branch 'main' into dev-6042
MuthuSundaravadivel May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions defaultconfig/console/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
}
20 changes: 10 additions & 10 deletions definitions/console/deployer-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions integration/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions operatorconfig/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions sample-network-multi-org/justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions sample-network-multi-org/scripts/check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
4 changes: 2 additions & 2 deletions sample-network-multi-org/scripts/test-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions sample-network/network
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion testdata/deployercm/deployer-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading