Преглед на файлове

Restructuring the `Schedule` tag

Default schedule tag for prod/common is now 'None'.
Schedule tag for 'test' defaults to 'MSOC' as before.
Schedule tag for '090-instance-vault' and '160-splunk-indexer-cluster'
now overrides to None.
Fred Damstra преди 4 години
родител
ревизия
19e262e415

+ 1 - 1
common/aws/mdr-common-services/008-xdr-binaries/terragrunt.hcl

@@ -18,7 +18,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/globally_accessible_bucket?ref=v0.9.4"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/globally_accessible_bucket?ref=v1.0.1"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 0
common/env.hcl

@@ -5,6 +5,7 @@ locals {
   transit_gateway_account_name = "mdr-prod-c2" # Which account has the transit gateway
 
   environment_tags = {
+    "Schedule" = "none",
     Environment = local.environment
   }
 

+ 0 - 1
globals.hcl

@@ -5,7 +5,6 @@ locals {
   binaries_bucket     = "afsxdr-binaries"        # Storage for binaries
 
   global_tags = {
-    "Schedule" = "MSOC",
     "Snapshot" = "Daily", # This will put it on some things where it doesn't belong, but seems useful overall
     #"Last_Updated" = timestamp() # while this is cool, its usefulness does not warrant the constant updates.
   }

+ 1 - 0
prod/env.hcl

@@ -5,6 +5,7 @@ locals {
   transit_gateway_account_name = "mdr-prod-c2" # Which account has the transit gateway
 
   environment_tags = {
+    "Schedule" = "none",
     Environment = local.environment
   }
 

+ 2 - 1
test/aws-us-gov/mdr-test-c2/090-instance-vault/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/vault?ref=v0.9.12"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/vault?ref=v1.0.2"
 }
 
 dependency "vpc-system-services" {
@@ -33,6 +33,7 @@ inputs = {
   tags = {
     Purpose = "Vault"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+    Schedule  = "none"
   }
   instance_name = "vault"
   instance_type = local.account_vars.locals.vault_server_instance_type

+ 1 - 0
test/aws-us-gov/mdr-test-c2/160-splunk-indexer-cluster/terragrunt.hcl

@@ -33,6 +33,7 @@ inputs = {
   tags = {
     Purpose = "Splunk Indexer Cluster"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+    Schedule  = "none"
   }
   prefix = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-indexer"]

+ 1 - 0
test/aws-us-gov/mdr-test-modelclient/160-splunk-indexer-cluster/terragrunt.hcl

@@ -33,6 +33,7 @@ inputs = {
   tags = {
     Purpose = "Splunk Indexer Cluster"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+    Schedule  = "none"
   }
   prefix = local.account_vars.locals.splunk_prefix
   instance_type = local.account_vars.locals.instance_types["splunk-indexer"]

+ 1 - 1
test/aws/mdr-test-c2/007-aws-scheduler/terragrunt.hcl

@@ -14,7 +14,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/aws_scheduler?ref=v1.0.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/aws_scheduler?ref=v1.0.2"
 }
 
 # Include all settings from the root terragrunt.hcl file

+ 1 - 0
test/env.hcl

@@ -5,6 +5,7 @@ locals {
   transit_gateway_account_name = "mdr-test-c2" # Which account has the transit gateway
 
   environment_tags = {
+    "Schedule" = "MSOC",
     Environment = local.environment
   }