Merge pull request 2i2c-org#4742 from consideRatio/pr/tags

terraform, aws: ManagedBy and 2i2c.org/cluster-name tags for all clusters
consideRatio · Sep 6, 2024 · 04267fd · 04267fd
2 parents 82bdce5 + 164cdfc
commit 04267fd
Show file tree

Hide file tree

Showing 19 changed files with 140 additions and 111 deletions.
diff --git a/terraform/aws/projects/2i2c-aws-us.tfvars b/terraform/aws/projects/2i2c-aws-us.tfvars
@@ -1,11 +1,11 @@
-region = "us-west-2"
-
-cluster_name = "2i2c-aws-us"
-
+region                 = "us-west-2"
+cluster_name           = "2i2c-aws-us"
 cluster_nodes_location = "us-west-2a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "2i2c-aws-us",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/catalystproject-africa.tfvars b/terraform/aws/projects/catalystproject-africa.tfvars
@@ -1,11 +1,11 @@
-region = "af-south-1"
-
-cluster_name = "catalystproject-africa"
-
+region                 = "af-south-1"
+cluster_name           = "catalystproject-africa"
 cluster_nodes_location = "af-south-1a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "catalystproject-africa",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/earthscope.tfvars b/terraform/aws/projects/earthscope.tfvars
@@ -1,18 +1,17 @@
-region = "us-east-2"
-
-cluster_name = "earthscope"
-
+region                 = "us-east-2"
+cluster_name           = "earthscope"
 cluster_nodes_location = "us-east-2a"
 
-default_budget_alert = {
-  "enabled" : false,
-}
-
 tags = {
+  "2i2c.org/cluster-name" : "earthscope",
   "ManagedBy" : "2i2c",
   # Requested by the community in https://2i2c.freshdesk.com/a/tickets/1460
   "earthscope:application:name" : "geolab",
-  "earthscope:application:owner" : "research-onramp-to-the-cloud"
+  "earthscope:application:owner" : "research-onramp-to-the-cloud",
+}
+
+default_budget_alert = {
+  "enabled" : false,
 }
 
 user_buckets = {

diff --git a/terraform/aws/projects/gridsst.tfvars b/terraform/aws/projects/gridsst.tfvars
@@ -1,11 +1,11 @@
-region = "us-west-2"
-
-cluster_name = "gridsst"
-
+region                 = "us-west-2"
+cluster_name           = "gridsst"
 cluster_nodes_location = "us-west-2a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "gridsst",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/jupyter-health.tfvars b/terraform/aws/projects/jupyter-health.tfvars
@@ -1,11 +1,11 @@
-region = "us-east-2"
-
-cluster_name = "jupyter-health"
-
+region                 = "us-east-2"
+cluster_name           = "jupyter-health"
 cluster_nodes_location = "us-east-2a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "jupyter-health",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/jupyter-meets-the-earth.tfvars b/terraform/aws/projects/jupyter-meets-the-earth.tfvars
@@ -1,16 +1,16 @@
-region = "us-west-2"
-
-cluster_name = "jupyter-meets-the-earth"
-
+region                 = "us-west-2"
+cluster_name           = "jupyter-meets-the-earth"
 cluster_nodes_location = "us-west-2a"
 
+
+tags = {
+  "2i2c.org/cluster-name" : "jupyter-meets-the-earth",
+  "ManagedBy" : "2i2c",
+}
 default_budget_alert = {
   "enabled" : false,
 }
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
-
 user_buckets = {
   "scratch-staging" : {
     "delete_after" : 7

diff --git a/terraform/aws/projects/kitware.tfvars b/terraform/aws/projects/kitware.tfvars
@@ -1,11 +1,11 @@
-region = "us-west-2"
-
-cluster_name = "kitware"
-
+region                 = "us-west-2"
+cluster_name           = "kitware"
 cluster_nodes_location = "us-west-2a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "kitware",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/nasa-cryo.tfvars b/terraform/aws/projects/nasa-cryo.tfvars
@@ -1,11 +1,11 @@
-region = "us-west-2"
-
-cluster_name = "nasa-cryo"
-
+region                 = "us-west-2"
+cluster_name           = "nasa-cryo"
 cluster_nodes_location = "us-west-2a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "nasa-cryo",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/nasa-esdis.tfvars b/terraform/aws/projects/nasa-esdis.tfvars
@@ -1,16 +1,16 @@
-region = "us-west-2"
-
-cluster_name = "nasa-esdis"
-
+region                 = "us-west-2"
+cluster_name           = "nasa-esdis"
 cluster_nodes_location = "us-west-2a"
 
+tags = {
+  "2i2c.org/cluster-name" : "nasa-esdis",
+  "ManagedBy" : "2i2c",
+}
+
 default_budget_alert = {
   "enabled" : false,
 }
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
-
 user_buckets = {
   "scratch-staging" : {
     "delete_after" : 7

diff --git a/terraform/aws/projects/nasa-ghg.tfvars b/terraform/aws/projects/nasa-ghg.tfvars
@@ -1,16 +1,16 @@
-region = "us-west-2"
-
-cluster_name = "nasa-ghg-hub"
-
+region                 = "us-west-2"
+cluster_name           = "nasa-ghg-hub"
 cluster_nodes_location = "us-west-2a"
 
+tags = {
+  "2i2c.org/cluster-name" : "nasa-ghg-hub",
+  "ManagedBy" : "2i2c",
+}
+
 default_budget_alert = {
   "enabled" : false,
 }
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
-
 user_buckets = {
   "scratch-staging" : {
     "delete_after" : 7

diff --git a/terraform/aws/projects/nasa-veda.tfvars b/terraform/aws/projects/nasa-veda.tfvars
@@ -1,16 +1,16 @@
-region = "us-west-2"
-
-cluster_name = "nasa-veda"
-
+region                 = "us-west-2"
+cluster_name           = "nasa-veda"
 cluster_nodes_location = "us-west-2a"
 
+tags = {
+  "2i2c.org/cluster-name" : "nasa-veda",
+  "ManagedBy" : "2i2c",
+}
+
 default_budget_alert = {
   "enabled" : false,
 }
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
-
 user_buckets = {
   "scratch-staging" : {
     "delete_after" : 7

diff --git a/terraform/aws/projects/openscapes.tfvars b/terraform/aws/projects/openscapes.tfvars
@@ -1,9 +1,12 @@
-region = "us-west-2"
-
-cluster_name = "openscapeshub"
-
+region                 = "us-west-2"
+cluster_name           = "openscapeshub"
 cluster_nodes_location = "us-west-2b"
 
+tags = {
+  "2i2c.org/cluster-name" : "openscapeshub",
+  "ManagedBy" : "2i2c",
+}
+
 default_budget_alert = {
   "enabled" : false,
 }
@@ -13,10 +16,6 @@ enable_aws_ce_grafana_backend_iam = true
 athena_write_storage_bucket       = "openscapes-cost-usage-report"
 athena_read_storage_bucket        = "openscapes-2i2c-cur"
 
-
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
-
 # The initial EFS is now used by the prod hub only
 # So we tag it appropriately for costs purposes
 original_single_efs_tags = { "2i2c:hub-name" : "prod" }
@@ -98,8 +97,8 @@ hub_cloud_permissions = {
 active_cost_allocation_tags = [
   "2i2c:hub-name",
   "2i2c:node-purpose",
+  "2i2c.org/cluster-name",
   "alpha.eksctl.io/cluster-name",
-  "aws:eks:cluster-name",
   "kubernetes.io/cluster/{var_cluster_name}",
   "kubernetes.io/created-for/pvc/name",
   "kubernetes.io/created-for/pvc/namespace",

diff --git a/terraform/aws/projects/opensci.tfvars b/terraform/aws/projects/opensci.tfvars
@@ -1,11 +1,11 @@
-region = "us-west-2"
-
-cluster_name = "opensci"
-
+region                 = "us-west-2"
+cluster_name           = "opensci"
 cluster_nodes_location = "us-west-2a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "opensci",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/projectpythia.tfvars b/terraform/aws/projects/projectpythia.tfvars
@@ -1,16 +1,16 @@
-region = "us-west-2"
-
-cluster_name = "projectpythia"
-
+region                 = "us-west-2"
+cluster_name           = "projectpythia"
 cluster_nodes_location = "us-west-2a"
 
+tags = {
+  "2i2c.org/cluster-name" : "projectpythia",
+  "ManagedBy" : "2i2c",
+}
+
 default_budget_alert = {
   "enabled" : false,
 }
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
-
 # Tip: uncomment and fill the missing info in the lines below if you want
 #       to setup scratch buckets for the hubs on this cluster.
 #

diff --git a/terraform/aws/projects/smithsonian.tfvars b/terraform/aws/projects/smithsonian.tfvars
@@ -2,8 +2,10 @@ region                 = "us-east-2"
 cluster_name           = "smithsonian"
 cluster_nodes_location = "us-east-2b"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "smithsonian",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/template.tfvars b/terraform/aws/projects/template.tfvars
@@ -8,6 +8,11 @@ region                 = "{{ cluster_region }}"
 cluster_name           = "{{ cluster_name }}"
 cluster_nodes_location = "{{ cluster_region }}a"
 
+tags = {
+  "ManagedBy" : "2i2c",
+  "2i2c.org/cluster-name" : "{{ cluster_name }}",
+}
+
 # Tip: uncomment and fill the missing info in the lines below if you want
 #       to setup scratch buckets for the hubs on this cluster.
 #

diff --git a/terraform/aws/projects/ubc-eoas.tfvars b/terraform/aws/projects/ubc-eoas.tfvars
@@ -1,11 +1,11 @@
-region = "ca-central-1"
-
-cluster_name = "ubc-eoas"
-
+region                 = "ca-central-1"
+cluster_name           = "ubc-eoas"
 cluster_nodes_location = "ca-central-1a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "ubc-eoas",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {

diff --git a/terraform/aws/projects/victor.tfvars b/terraform/aws/projects/victor.tfvars
@@ -1,11 +1,11 @@
-region = "us-west-2"
-
-cluster_name = "victor"
-
+region                 = "us-west-2"
+cluster_name           = "victor"
 cluster_nodes_location = "us-west-2a"
 
-# Remove this variable to tag all our resources with {"ManagedBy": "2i2c"}
-tags = {}
+tags = {
+  "2i2c.org/cluster-name" : "victor",
+  "ManagedBy" : "2i2c",
+}
 
 user_buckets = {
   "scratch-staging" : {