Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PR-6041 Update Cumulus to v18.3.3 #205

Merged
merged 5 commits into from
Sep 4, 2024
Merged

PR-6041 Update Cumulus to v18.3.3 #205

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b31015c
Add missing CHANGELOG entry for link to cumulus 18.3.1 release
reweeden Aug 29, 2024
6c26129
Update Cumulus to v18.3.3
reweeden Aug 29, 2024
b0fa6d2
Prepare release for v18.3.3.0
reweeden Aug 30, 2024
814aac6
Fix whitespace issues in Makefile comment
reweeden Aug 30, 2024
3e5b84b
Add `volume_type` to elasticsearch config
reweeden Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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.
Expand Down
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion cumulus/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion data-persistence/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading