Skip to content

Commit

Permalink
Cumulus Upgrade from v18.2.0 to v18.3.0. This upgrade includes a chan…
Browse files Browse the repository at this point in the history
…ge from node 16 to node 20. Also, there was a db migration related problem with ORCA during this upgrade. That problem is resolved in Cumulus v18.5.1 and Orca v10.x. #385
  • Loading branch information
Kris Stanton committed Jan 2, 2025
1 parent 7982784 commit 9ade027
Show file tree
Hide file tree
Showing 10 changed files with 3,077 additions and 3,277 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.20.2
20.12.2
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@


"--install.ignore-optional" true
yarn-path ".yarn/releases/yarn-1.22.19.cjs"
yarn-path ".yarn/releases/yarn-1.22.22.cjs"
2 changes: 1 addition & 1 deletion app/stacks/cumulus/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ module "cumulus" {
deploy_to_ngap = true

cumulus_message_adapter_lambda_layer_version_arn = module.cma.lambda_layer_version_arn
async_operation_image = "cumuluss/async-operation:47"
async_operation_image = "cumuluss/async-operation:52"

vpc_id = module.vpc.vpc_id
lambda_subnet_ids = module.vpc.subnets.ids
Expand Down
1 change: 1 addition & 0 deletions app/stacks/data-persistence/tfvars/base.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ elasticsearch_config = {
instance_count = 2
instance_type = "t2.small.elasticsearch"
version = "5.3"
volume_type = "gp2"
volume_size = 10
}
2 changes: 2 additions & 0 deletions app/stacks/data-persistence/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ variable "elasticsearch_config" {
instance_count = number
instance_type = string
version = string
volume_type = string
volume_size = number
})
default = {
domain_name = "es"
instance_count = 1
instance_type = "t2.small.elasticsearch"
version = "5.3"
volume_type = "gp2"
volume_size = 10
}
}
Expand Down
14 changes: 14 additions & 0 deletions app/stacks/rds-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,18 @@ module "rds_cluster" {
subnets = module.vpc.subnets.ids
tags = { Deployment = var.prefix }
vpc_id = module.vpc.vpc_id

# This part is to allow Orca v9.0.5 to succeed while doing Cumulus upgrade from 18.2.0 to 18.3.3
db_parameters = [
{
name = "shared_preload_libraries"
value = "pg_stat_statements,auto_explain"
apply_method = "pending-reboot"
},
{
name = "rds.force_ssl"
value = 0
apply_method = "pending-reboot"
}
]
}
2 changes: 1 addition & 1 deletion config/helpers/cumulus_version_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Terraspace::Project::CumulusVersionHelper
def cumulus_version
"v18.2.0"
"v18.3.3"
end
end
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@
"tf:lambda:archive-exploded": "yarn lambda:archive-exploded >&2 && echo { '\"'dir'\"': '\"'${PWD}/${npm_package_config_lambda_archive_dir}'\"' }"
},
"engines": {
"node": ">=16"
"node": ">=20"
},
"dependencies": {
"@aws-sdk/client-s3": "^3.370.0",
"@aws-sdk/client-sts": "^3.370.0",
"@aws-sdk/lib-dynamodb": "^3.370.0",
"@aws-sdk/lib-storage": "^3.370.0",
"@aws-sdk/types": "^3.370.0",
"@cumulus/aws-client": "18.2.0",
"@cumulus/cmrjs": "18.2.0",
"@cumulus/common": "18.2.0",
"@cumulus/aws-client": "18.3.3",
"@cumulus/cmrjs": "18.3.3",
"@cumulus/common": "18.3.3",
"@cumulus/cumulus-message-adapter-js": "2.0.4",
"@smithy/util-stream": "^2.0.17",
"date-fns": "^3.0.6",
Expand All @@ -78,10 +78,10 @@
"devDependencies": {
"@ava/typescript": "^4.1.0",
"@aws-sdk/client-dynamodb": "^3.370.0",
"@cumulus/api-client": "18.2.0",
"@cumulus/types": "18.2.0",
"@cumulus/api-client": "18.3.3",
"@cumulus/types": "18.3.3",
"@istanbuljs/nyc-config-typescript": "^1.0.1",
"@tsconfig/node16": "^16.1.1",
"@tsconfig/node20": "^20.1.4",
"@types/aws-lambda": "^8.10.85",
"@types/lodash": "^4.14.177",
"@types/node": "^16.11.1",
Expand All @@ -105,8 +105,8 @@
"source-map-support": "^0.5.19",
"standard-version": "^9.0.0",
"ts-node": "^10.3.0",
"typedoc": "^0.25.3",
"typescript": "^4.9.0"
"typedoc": "^0.27.5",
"typescript": "^5"
},
"resolutions": {
"@cumulus/**/@aws-sdk/client-s3": "^3.370.0",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@tsconfig/node16/tsconfig.json",
"extends": "@tsconfig/node20/tsconfig.json",
"compilerOptions": {
"incremental": false,
"outDir": "build/main",
Expand Down
Loading

0 comments on commit 9ade027

Please sign in to comment.