BFD-2976: Remove ec2 ebs dlm lifecycle (#1996)

CMSgov · Oct 16, 2023 · 7bd248a · 7bd248a
1 parent 8ed84b9
commit 7bd248a
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 133 deletions.
diff --git a/ops/terraform/env/global/dlm/backend.tf b/ops/terraform/env/global/dlm/backend.tf
diff --git a/ops/terraform/env/global/dlm/main.tf b/ops/terraform/env/global/dlm/main.tf
diff --git a/ops/terraform/modules/resources/dlm/main.tf b/ops/terraform/modules/resources/dlm/main.tf
diff --git a/ops/terraform/modules/resources/dlm/variables.tf b/ops/terraform/modules/resources/dlm/variables.tf
diff --git a/ops/terraform/services/migrator/main.tf b/ops/terraform/services/migrator/main.tf
@@ -76,7 +76,7 @@ resource "aws_instance" "this" {
   }
 
   root_block_device {
-    tags                  = merge(local.default_tags, { snapshot = "true" }) # TODO: Consider removing the tag from migrator instances
+    tags                  = local.default_tags
     volume_type           = "gp2"
     volume_size           = local.volume_size
     delete_on_termination = true

diff --git a/ops/terraform/services/pipeline/main.tf b/ops/terraform/services/pipeline/main.tf
@@ -59,7 +59,7 @@ locals {
   }
 
   pipeline_log_availability = {
-    period       = 1 * 60 * 60 # 1 hour 
+    period       = 1 * 60 * 60 # 1 hour
     eval_periods = 1
     threshold    = 0
     datapoints   = 1
@@ -86,7 +86,7 @@ locals {
   ok_actions    = local.is_prod ? [data.aws_sns_topic.ok[0].arn] : []
 
   # The log availability alarm will post an incident in prod; in other envs it will get posted
-  # to #bfd-test 
+  # to #bfd-test
   # TODO: Replace testing SNS topic in BFD-2244
   log_availability_alarm_actions = local.is_ephemeral_env ? [] : local.is_prod ? [data.aws_sns_topic.alarm[0].arn] : [data.aws_sns_topic.bfd_test_slack_alarm[0].arn]
 
@@ -213,7 +213,6 @@ resource "aws_launch_template" "this" {
         {
           Layer    = local.layer
           role     = local.legacy_service
-          snapshot = true
         },
         each.value.tags
       )
@@ -315,7 +314,6 @@ resource "aws_instance" "pipeline" {
     {
       Layer    = local.layer
       role     = local.legacy_service
-      snapshot = true
     },
     each.value.tags
   )
@@ -336,7 +334,6 @@ resource "aws_instance" "pipeline" {
     {
       Layer    = local.layer
       role     = local.legacy_service
-      snapshot = true
     },
     each.value.tags
   )

diff --git a/ops/terraform/services/server/modules/bfd_server_asg/main.tf b/ops/terraform/services/server/modules/bfd_server_asg/main.tf
@@ -153,7 +153,7 @@ resource "aws_launch_template" "main" {
 
   tag_specifications {
     resource_type = "volume"
-    tags          = merge({ snapshot = "true", Name = "bfd-${local.env}-${var.role}" }, local.additional_tags)
+    tags          = merge({ Name = "bfd-${local.env}-${var.role}" }, local.additional_tags)
   }
 }
 

diff --git a/ops/utils/backups/purge-old-resources/purge.py b/ops/utils/backups/purge-old-resources/purge.py
@@ -14,11 +14,11 @@
 DEBUG = False
 
 ## EC2 EBS Retention
-# Retain any snapshots associated with an active EC2 volume and purge all others after n days. The filter
-# will match DLM lifecycle created snapshots.
+# Retain any snapshots associated with an active EC2 volume and purge any snapshots created by the defunct DLM policy
+# after n days. The filter will match DLM lifecycle created snapshots.
 EC2_MIN_RETENTION_DAYS = 1
 EC2_DAILY_EBS_SNAPSHOT_FILTER = [
-    {'Name': 'description','Values': ['Created for policy*']},
+    {'Name': 'description','Values': ['Created for policy-0abe3036d255e9ae0']},
     {'Name': 'status','Values': ['completed']},
 ]
 #