diff --git a/deploy/ansible/vars/packages.yml b/deploy/ansible/vars/packages.yml index 57cd06cbaa..926764a778 100644 --- a/deploy/ansible/vars/packages.yml +++ b/deploy/ansible/vars/packages.yml @@ -1,22 +1,4 @@ --- -############################### -# This file defines package versions where specific packages version are -# specified in the playbooks. To update a package, change the version in -# this file and rerun the specified playbook -############################### - -# MongoDB version -mongodb_version: 4.4 - -# Packages installed by playbook_docker.yml -docker_compose_version: 1.28.5 - -# Version for aws-cli installed by aws_access role -aws_cli_version: 2.1.28 - -# Version for cert_manager.io -cert_manager_version: v1.7.1 - # Packages required for targets required_packages: - python3 diff --git a/deploy/helm/aws-login/values.yaml b/deploy/helm/aws-login/values.yaml index 9576746312..291d9b7e28 100644 --- a/deploy/helm/aws-login/values.yaml +++ b/deploy/helm/aws-login/values.yaml @@ -29,7 +29,3 @@ awsEcr: serviceAccount: account-ecr-login role: role-ecr-login roleBinding: role-ecr-login-binding - -database: - mongo_image_tag: 4.4 - data_size: 16Gi diff --git a/deploy/helm/thecombine/charts/database/values.yaml b/deploy/helm/thecombine/charts/database/values.yaml index ce9d2278b0..74ebd2a243 100644 --- a/deploy/helm/thecombine/charts/database/values.yaml +++ b/deploy/helm/thecombine/charts/database/values.yaml @@ -2,5 +2,5 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -mongoImageTag: "4.4" +mongoImageTag: "5.0" persistentVolumeSize: 16Gi diff --git a/maintenance/scripts/combine_app.py b/maintenance/scripts/combine_app.py index f16b14f62b..4baae592bb 100644 --- a/maintenance/scripts/combine_app.py +++ b/maintenance/scripts/combine_app.py @@ -114,7 +114,7 @@ def db_cmd(self, cmd: str) -> Optional[Dict[str, Any]]: """ db_results = self.exec( self.get_pod_id(CombineApp.Component.Database), - ["/usr/bin/mongo", "--quiet", "CombineDatabase", "--eval", cmd], + ["/usr/bin/mongosh", "--quiet", "CombineDatabase", "--eval", cmd], ) result_str = self.object_id_to_str(db_results.stdout) if result_str != "": @@ -129,7 +129,7 @@ def db_query( cmd = f"db.{collection}.find({query}, {projection}).toArray()" db_results = self.exec( self.get_pod_id(CombineApp.Component.Database), - ["/usr/bin/mongo", "--quiet", "CombineDatabase", "--eval", cmd], + ["/usr/bin/mongosh", "--quiet", "CombineDatabase", "--eval", cmd], ) result_str = self.object_id_to_str(db_results.stdout) if result_str != "": diff --git a/scripts/dropDB.ts b/scripts/dropDB.ts index 13d0e04cfc..c8371dbd60 100644 --- a/scripts/dropDB.ts +++ b/scripts/dropDB.ts @@ -1,6 +1,6 @@ import { spawnSync } from "child_process"; -const cmd = spawnSync("mongo", [ +const cmd = spawnSync("mongosh", [ "-eval", "db.getSiblingDB('CombineDatabase').dropDatabase()", ]); diff --git a/scripts/setAdminUser.ts b/scripts/setAdminUser.ts index 268349b4b1..300f71fc77 100644 --- a/scripts/setAdminUser.ts +++ b/scripts/setAdminUser.ts @@ -8,7 +8,11 @@ if (args.length > 0) { const user = args[0]; const updateCommand = `db.UsersCollection.updateOne({username: "${user}"}, {$set: {isAdmin: true}});`; - const cmd = spawnSync("mongo", ["--eval", updateCommand, "CombineDatabase"]); + const cmd = spawnSync("mongosh", [ + "--eval", + updateCommand, + "CombineDatabase", + ]); console.log(`stderr: ${cmd.stderr.toString()}`); console.log(`stdout: ${cmd.stdout.toString()}`); } else {