Merge pull request #5046 from GeorgianaElena/cost-attr/remaining

[smithsonian, strudel, ubc-eoas] Enable cost attribution
2i2c-org · Nov 7, 2024 · 2aa8c91 · 2aa8c91
2 parents 67198eb + 18fb5be
commit 2aa8c91
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/config/clusters/smithsonian/support.values.yaml b/config/clusters/smithsonian/support.values.yaml
@@ -32,3 +32,11 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.smithsonian.2i2c.cloud
+
+aws-ce-grafana-backend:
+  enabled: true
+  envBasedConfig:
+    clusterName: smithsonian
+  serviceAccount:
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::969396938818:role/aws_ce_grafana_backend_iam_role
diff --git a/config/clusters/strudel/support.values.yaml b/config/clusters/strudel/support.values.yaml
@@ -27,6 +27,14 @@ grafana:
         hosts:
           - grafana.strudel.2i2c.cloud
 
+aws-ce-grafana-backend:
+  enabled: true
+  envBasedConfig:
+    clusterName: strudel
+  serviceAccount:
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::207567775686:role/aws_ce_grafana_backend_iam_role
+
 cluster-autoscaler:
   enabled: true
   autoDiscovery:

diff --git a/config/clusters/ubc-eoas/support.values.yaml b/config/clusters/ubc-eoas/support.values.yaml
@@ -32,3 +32,11 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.ubc-eoas.2i2c.cloud
+
+aws-ce-grafana-backend:
+  enabled: true
+  envBasedConfig:
+    clusterName: ubc-eoas
+  serviceAccount:
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::259060176665:role/aws_ce_grafana_backend_iam_role
diff --git a/terraform/aws/projects/smithsonian.tfvars b/terraform/aws/projects/smithsonian.tfvars
@@ -2,12 +2,16 @@ region                 = "us-east-2"
 cluster_name           = "smithsonian"
 cluster_nodes_location = "us-east-2b"
 
+enable_aws_ce_grafana_backend_iam = true
+
 user_buckets = {
   "scratch-staging" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "staging" },
   },
   "scratch" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "prod" },
   },
 }
 

diff --git a/terraform/aws/projects/strudel.tfvars b/terraform/aws/projects/strudel.tfvars
@@ -7,6 +7,8 @@ region                 = "us-west-2"
 cluster_name           = "strudel"
 cluster_nodes_location = "us-west-2a"
 
+enable_aws_ce_grafana_backend_iam = true
+
 # 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
@@ -2,16 +2,19 @@ region                 = "ca-central-1"
 cluster_name           = "ubc-eoas"
 cluster_nodes_location = "ca-central-1a"
 
+enable_aws_ce_grafana_backend_iam = true
+
 user_buckets = {
   "scratch-staging" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "staging" },
   },
   "scratch" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "prod" },
   },
 }
 
-
 hub_cloud_permissions = {
   "staging" : {
     "user-sa" : {