Merge pull request #205 from asfadmin/rew/pr-6041-cumulus-18.3.3

PR-6041 Update Cumulus to v18.3.3
asfadmin · Sep 4, 2024 · 0efcb67 · 0efcb67
2 parents 588a28e + 3e5b84b
commit 0efcb67
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # CHANGELOG
 
 ## Unreleased
+
+## v18.3.3.0
+* Upgrade to [Cumulus v18.3.3](https://github.com/nasa/cumulus/releases/tag/v18.3.3)
 * add .gitconfig file to Docker image to mark /CIRRUS-core and /CIRRUS-DAAC as safe
 * Tag resources using the aws provider level `default_tags` configuration
 
@@ -10,6 +13,7 @@
 * update core image to build from aws/lambda/python:3.9 as the python3 target
 
 ## v18.3.1.0
+* Upgrade to [Cumulus v18.3.1](https://github.com/nasa/cumulus/releases/tag/v18.3.1)
 * Added separate urs_tea_client_id and urs_tea_client_password that can be specified if these are different from the non-tea versions of the variables.
 * Added optional ecs_include_docker_cleanup_cronjob variable, defaulting to False.
 * Fixed the value of the output report_granules_sns_topic_arn to point to module.cumulus.report_granules_sns_topic_arn instead of report_executions_sns_topic_arn.

diff --git a/Makefile b/Makefile
@@ -11,15 +11,16 @@
 #  AWS_ACCESS_KEY_ID:     Set for the account to which you are deploying
 #  AWS_SECRET_ACCESS_KEY: Set for the account to which you are deploying
 #  AWS_REGION:            The region to which you are deploying
-#  AWS_ACCOUNT_ID:	  The AWS account ID to which you are deploying
+#  AWS_ACCOUNT_ID:        The AWS account ID to which you are deploying
 #  AWS_ACCOUNT_ID_LAST4:  The Last 4 digits of AWS_ACCOUNT_ID
 #
-#  DEPLOY_NAME:           A unique name to distinguish this Cumulus instance from others
+#  DEPLOY_NAME:           A unique name to distinguish this Cumulus instance
+#                         from others
 #  MATURITY:              One of: SBX, SIT, UAT, PROD
-#  PYTHON_VER: 			  python3
+#  PYTHON_VER:            python3
 
 # ---------------------------
-DOCKER_TAG := v18.3.1.1
+DOCKER_TAG := v18.3.3.0
 export TF_IN_AUTOMATION="true"
 export TF_VAR_MATURITY=${MATURITY}
 export TF_VAR_DEPLOY_NAME=${DEPLOY_NAME}

diff --git a/cumulus/main.tf b/cumulus/main.tf
@@ -1,5 +1,5 @@
 module "cumulus" {
-  source = "https://github.com/nasa/cumulus/releases/download/v18.3.1/terraform-aws-cumulus.zip//tf-modules/cumulus"
+  source = "https://github.com/nasa/cumulus/releases/download/v18.3.3/terraform-aws-cumulus.zip//tf-modules/cumulus"
 
   cumulus_message_adapter_lambda_layer_version_arn = data.terraform_remote_state.daac.outputs.cma_layer_arn
 

diff --git a/data-persistence/main.tf b/data-persistence/main.tf
@@ -1,5 +1,5 @@
 module "data_persistence" {
-  source = "https://github.com/nasa/cumulus/releases/download/v18.3.1/terraform-aws-cumulus.zip//tf-modules/data-persistence"
+  source = "https://github.com/nasa/cumulus/releases/download/v18.3.3/terraform-aws-cumulus.zip//tf-modules/data-persistence"
 
   prefix                = local.prefix
   subnet_ids            = data.aws_subnets.subnet_ids.ids

diff --git a/data-persistence/variables.tf b/data-persistence/variables.tf
@@ -28,12 +28,14 @@ variable "elasticsearch_config" {
     instance_type  = string
     version        = string
     volume_size    = number
+    volume_type    = string
   })
   default = {
     domain_name    = "es"
     instance_count = 2
     instance_type  = "t2.small.elasticsearch"
     version        = "5.3"
     volume_size    = 10
+    volume_type    = "gp2"
   }
 }