From b31015cff25572bcad576eea3d8d6ed96106a0bf Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 29 Aug 2024 15:37:16 -0800 Subject: [PATCH 1/5] Add missing CHANGELOG entry for link to cumulus 18.3.1 release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e66a5ec..3c36156 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,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. From 6c26129ac31f83b5710024db279e7c5213cf8635 Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 29 Aug 2024 15:37:52 -0800 Subject: [PATCH 2/5] Update Cumulus to v18.3.3 --- CHANGELOG.md | 1 + cumulus/main.tf | 2 +- data-persistence/main.tf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c36156..c7db104 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG ## Unreleased +* 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 diff --git a/cumulus/main.tf b/cumulus/main.tf index 2a8878a..a24b3c6 100644 --- 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 index f89f5e5..deff0fd 100644 --- 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 From b0fa6d23e11476e74ed61d6ae3a92a1f41025148 Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 29 Aug 2024 16:05:47 -0800 Subject: [PATCH 3/5] Prepare release for v18.3.3.0 --- CHANGELOG.md | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7db104..70e39b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # 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 diff --git a/Makefile b/Makefile index e93b5e6..56bcc91 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ # 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} From 814aac647d509a3cd136c9c0af8bf1db7d9abbe7 Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Thu, 29 Aug 2024 16:06:06 -0800 Subject: [PATCH 4/5] Fix whitespace issues in Makefile comment --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 56bcc91..68c974a 100644 --- a/Makefile +++ b/Makefile @@ -11,12 +11,13 @@ # 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.3.0 From 3e5b84b4210918a204e2f3adeb578ca4e625e1ff Mon Sep 17 00:00:00 2001 From: Rohan Weeden Date: Tue, 3 Sep 2024 09:04:16 -0800 Subject: [PATCH 5/5] Add `volume_type` to elasticsearch config --- data-persistence/variables.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data-persistence/variables.tf b/data-persistence/variables.tf index bf59290..693cb90 100644 --- a/data-persistence/variables.tf +++ b/data-persistence/variables.tf @@ -28,6 +28,7 @@ variable "elasticsearch_config" { instance_type = string version = string volume_size = number + volume_type = string }) default = { domain_name = "es" @@ -35,5 +36,6 @@ variable "elasticsearch_config" { instance_type = "t2.small.elasticsearch" version = "5.3" volume_size = 10 + volume_type = "gp2" } }