Skip to content

Commit

Permalink
Bump CouchDB to 3.3.2
Browse files Browse the repository at this point in the history
Bump CouchDB to 3.3.2.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart committed Apr 27, 2023
1 parent 60297e5 commit 2213953
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions regression/hsm/docker/docker-compose-test-net.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
environment:
- COUCHDB_USER=admin
- COUCHDB_PASSWORD=adminpw
image: couchdb:3.2
image: couchdb:3.3.2
networks:
test:

Expand Down Expand Up @@ -101,7 +101,7 @@ services:
environment:
- COUCHDB_USER=admin
- COUCHDB_PASSWORD=adminpw
image: couchdb:3.2
image: couchdb:3.3.2
networks:
test:

Expand Down
2 changes: 1 addition & 1 deletion tools/operator/launcher/k8s/extendNetwork.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func (k8s K8s) extendLaunchObject(nsConfig networkspec.Config) ([]LaunchConfig,
container = corev1.Container{
Name: "couchdb",
Resources: k8s.resources(nsConfig.K8s.Resources.Couchdb),
Image: "couchdb:3.2",
Image: "couchdb:3.3.2",
ImagePullPolicy: corev1.PullPolicy("Always"),
Env: []corev1.EnvVar{
{
Expand Down
10 changes: 5 additions & 5 deletions tools/operator/launcher/k8s/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/hyperledger/fabric-test/tools/operator/networkspec"
)

//K8s -
// K8s -
type K8s struct {
KubeConfigPath string
Action string
Expand All @@ -25,7 +25,7 @@ type K8s struct {
Launch []LaunchConfig
}

//LaunchConfig --
// LaunchConfig --
type LaunchConfig struct {
Name string
Type string
Expand Down Expand Up @@ -100,7 +100,7 @@ func (k8s K8s) launchObject(nsConfig networkspec.Config) ([]LaunchConfig, error)
container = corev1.Container{
Name: "couchdb",
Resources: k8s.resources(nsConfig.K8s.Resources.Couchdb),
Image: "couchdb:3.2",
Image: "couchdb:3.3.2",
ImagePullPolicy: corev1.PullPolicy("Always"),
Env: []corev1.EnvVar{
{
Expand Down Expand Up @@ -406,7 +406,7 @@ func (k8s K8s) volumesList(componentType, orgName, name, dataPersistence string,
return volumes
}

//GenerateConfigurationFiles - to generate all the configuration files
// GenerateConfigurationFiles - to generate all the configuration files
func (k8s K8s) GenerateConfigurationFiles(upgrade bool) error {

network := nl.Network{}
Expand Down Expand Up @@ -449,7 +449,7 @@ func (k8s K8s) buildClientset(kubeconfig *string) (*kubernetes.Clientset, error)
return clientset, nil
}

//Network --
// Network --
func (k8s K8s) Network(action string) error {

var err error
Expand Down
2 changes: 1 addition & 1 deletion tools/operator/templates/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#@ for j in range(0, org.numPeers):
#@ container_name = "couchdb-peer{}-{}".format(j, org.name)
#@ env = ["COUCHDB_USER=admin", "COUCHDB_PASSWORD=adminpw"]
#@ services[container_name] = {"container_name":container_name, "environment":env, "image":"couchdb:3.2", "ports":["{}:5984".format(couchDBUniquePort)]}
#@ services[container_name] = {"container_name":container_name, "environment":env, "image":"couchdb:3.3.2", "ports":["{}:5984".format(couchDBUniquePort)]}
#@ couchDBUniquePort += 1
#@ end
#@ end
Expand Down
2 changes: 1 addition & 1 deletion tools/operator/templates/docker/peer-extend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#@ j = j + config.peerOrganizations[k].numPeers
#@ container_name = "couchdb-peer{}-{}".format(j, org.name)
#@ env = ["COUCHDB_USER=admin", "COUCHDB_PASSWORD=adminpw"]
#@ services[container_name] = {"container_name":container_name, "environment":env, "image":"couchdb:3.2", "ports":["{}:5984".format(couchDBUniquePort)]}
#@ services[container_name] = {"container_name":container_name, "environment":env, "image":"couchdb:3.3.2", "ports":["{}:5984".format(couchDBUniquePort)]}
#@ couchDBUniquePort += 1
#@ end
#@ end
Expand Down

0 comments on commit 2213953

Please sign in to comment.