PR-7426 Upgrade to cumulus 21.3.3

.github/workflows/deploy.yml

@@ -52,7 +52,11 @@ on:
         default: asfadmin/CIRRUS-core
       CORE_REF:
         description: The CIRRUS-core git ref to checkout
-        default: v21.3.2.0
+        default: v21.3.3.0
+      ENABLE_UPGRADE:
+        description: flag to control upgrade mode for RDS module
+        default: true
+        type: boolean
 
 concurrency:
   # group: <workflow>-<deploy-name>-<maturity>
@@ -90,20 +94,18 @@ jobs:
       DASHBOARD_REF: ${{ github.event.inputs.DASHBOARD_REF || 'v14.2.1' }}
       DEPLOY_NAME: ${{ github.event.inputs.DEPLOY_NAME || 'daac' }}
       CORE_REPO: ${{ github.event.inputs.CORE_REPO || 'asfadmin/CIRRUS-core' }}
-      CORE_REF: ${{ github.event.inputs.CORE_REF || 'v21.3.2.0' }}
+      CORE_REF: ${{ github.event.inputs.CORE_REF || 'v21.3.3.0' }}
       MAKE_TARGET: ${{ github.event.inputs.MAKE_TARGET || 'workflows' }}
       API_ROOT: ${{ github.event.inputs.DASHBOARD_API_ROOT || '' }}
       MATURITY: ${{ github.event.inputs.MATURITY || 'sbx' }}
       SNAPSHOT_IDENTIFIER: ${{ github.event.inputs.SNAPSHOT_IDENTIFIER || '' }}
+      ENABLE_UPGRADE: ${{ github.event.inputs.ENABLE_UPGRADE || true }}
       # GitHub Vars
       WORKSPACE: ${{ github.workspace }}
       CONTAINER_NAME_PREFIX: ${{ github.run_id }}
       BUILD_NUMBER: ${{ github.run_number }}
       EVENT_TYPE: ${{ github.event_name }}
       BRANCH: ${{ github.ref_name }}
-      # Mattermost Config
-      MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
-      MATTERMOST_CHANNEL: rain-cicd-notifications
 
     steps:
       - name: Update Docker.sock permissions
@@ -118,13 +120,6 @@ jobs:
           [[ $BRANCH =~ ^deploy\/([^\/]*) ]]
           echo "DEPLOY_NAME=${BASH_REMATCH[1]}" >> $GITHUB_ENV
 
-      - name: Notify Mattermost
-        uses: asfadmin/action-notify-mattermost@v1
-        with:
-          webhook-url: ${{ env.MATTERMOST_WEBHOOK_URL }}
-          channel: ${{ env.MATTERMOST_CHANNEL }}
-          text: "started deploying to `${{ env.DEPLOY_NAME }}-cumulus-${{ env.MATURITY }}`"
-
       - name: Configure 1Password Connect
         id: onepassword-connnection
         uses: 1password/load-secrets-action/configure@v2
@@ -183,7 +178,6 @@ jobs:
           echo "CORE_REPO: ${{ env.CORE_REPO }}"
           echo "CORE_REF: ${{ env.CORE_REF }}"
           echo "AWS_REGION: ${{ env.AWS_REGION }}"
-          echo "MATTERMOST_CHANNEL: ${{ env.MATTERMOST_CHANNEL }}"
           echo "MAKE_TARGET: ${{ env.MAKE_TARGET }}"
 
       - name: Set up Docker Buildx
@@ -248,24 +242,10 @@ jobs:
                             --env TF_VAR_launchpad_passphrase="${LAUNCHPAD_PASSPHRASE}" \
                             --env TF_VAR_metrics_es_password="${METS_PASSWORD}" \
                             --env TF_VAR_snapshot_identifier="$SNAPSHOT_IDENTIFIER" \
+                            --env TF_VAR_enable_upgrade="$ENABLE_UPGRADE" \
                             -v "$WORKSPACE/CIRRUS-core":/CIRRUS-core \
                             -v "$WORKSPACE/":/CIRRUS-DAAC \
                             -v /var/run/docker.sock:/var/run/docker.sock \
                             --name=$CONTAINER_NAME_PREFIX-cirrus-daac \
                             cirrus-core:$CORE_REF \
                             /bin/bash -c "make $MAKE_TARGET $DASHBOARD_TARGET"
-
-      - name: Notify Mattermost Finished
-        if: ${{ always() }}
-        uses: asfadmin/action-notify-mattermost@v1
-        with:
-          webhook-url: ${{ env.MATTERMOST_WEBHOOK_URL }}
-          channel: ${{ env.MATTERMOST_CHANNEL }}
-          text: "finished deploying to `${{ env.DEPLOY_NAME }}-cumulus-${{ env.MATURITY }}`"
-          statuses: >
-            [
-              {"name": "1Password Connection", "status": "${{ steps.onepassword-connnection.outcome }}"},
-              {"name": "1Password Secrets", "status": "${{ steps.load-secrets.outcome }}"},
-              {"name": "Core Build", "status": "${{ steps.docker.outcome }}"},
-              {"name": "AWS Deployment", "status": "${{ steps.aws.outcome }}"}
-            ]

CHANGELOG.md

@@ -3,6 +3,9 @@
 
 ## Unreleased
 
+## v21.3.3.0
+* Upgrade to [Cumulus v21.3.3](https://github.com/nasa/cumulus/releases/tag/v21.3.3)
+
 ## v21.3.2.0
 * Upgrade to [Cumulus v21.3.2](https://github.com/nasa/cumulus/releases/tag/v21.3.2)
 * Update to Python3.12

daac/s3-replicator.tf

@@ -24,7 +24,7 @@ locals {
 }
 
 module "s3-replicator" {
-  source = "https://github.com/nasa/cumulus/releases/download/v21.3.2/terraform-aws-cumulus-s3-replicator.zip"
+  source = "https://github.com/nasa/cumulus/releases/download/v21.3.3/terraform-aws-cumulus-s3-replicator.zip"
 
   prefix               = local.prefix
   vpc_id               = data.aws_vpc.application_vpcs.id

rds/main.tf

@@ -11,7 +11,7 @@ resource "random_string" "user_db_pass" {
 }
 
 module "rds_cluster" {
-  source = "https://github.com/nasa/cumulus/releases/download/v21.3.2/terraform-aws-cumulus-rds.zip"
+  source = "https://github.com/nasa/cumulus/releases/download/v21.3.3/terraform-aws-cumulus-rds.zip"
 
   backup_retention_period         = var.backup_retention_period
   backup_window                   = var.backup_window

rds/variables/sbx.tfvars

@@ -4,4 +4,4 @@ deletion_protection     = true
 provision_user_database = true
 
 # Set min_capacity to the lowest possible value in sandbox to lower idle cost.
-min_capacity = 0.5
+min_capacity = 0

workflows/main.tf

@@ -1,5 +1,5 @@
 module "example_workflow" {
-  source = "https://github.com/nasa/cumulus/releases/download/v21.3.2/terraform-aws-cumulus-workflow.zip"
+  source = "https://github.com/nasa/cumulus/releases/download/v21.3.3/terraform-aws-cumulus-workflow.zip"
 
   prefix          = local.prefix
   name            = "ExampleWorkflow"