Merge pull request #5037 from GeorgianaElena/cost-attr/2i2c-aws-us

Enable cost attribution for 2i2c-aws-us
2i2c-org · Nov 6, 2024 · 935c14c · 935c14c
2 parents 2eb68cd + ac9060b
commit 935c14c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/config/clusters/2i2c-aws-us/support.values.yaml b/config/clusters/2i2c-aws-us/support.values.yaml
@@ -29,6 +29,14 @@ prometheus:
     persistentVolume:
       size: 500Gi
 
+aws-ce-grafana-backend:
+  enabled: true
+  envBasedConfig:
+    clusterName: 2i2c-aws-us
+  serviceAccount:
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::790657130469:role/aws_ce_grafana_backend_iam_role
+
 cluster-autoscaler:
   enabled: true
   autoDiscovery:

diff --git a/terraform/aws/projects/2i2c-aws-us.tfvars b/terraform/aws/projects/2i2c-aws-us.tfvars
@@ -2,24 +2,32 @@ region                 = "us-west-2"
 cluster_name           = "2i2c-aws-us"
 cluster_nodes_location = "us-west-2a"
 
+enable_aws_ce_grafana_backend_iam = true
+
 user_buckets = {
   "scratch-staging" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "staging" },
   },
   "scratch-dask-staging" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "dask-staging" },
   },
   "scratch-showcase" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "showcase" },
   },
   "persistent-showcase" : {
-    "delete_after" : null
+    "delete_after" : null,
+    "tags" : { "2i2c:hub-name" : "showcase" },
   },
   "scratch-ncar-cisl" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "ncar-cisl" },
   },
   "scratch-itcoocean" : {
-    "delete_after" : 7
+    "delete_after" : 7,
+    "tags" : { "2i2c:hub-name" : "itcoocean" },
   },
 }