From 53c61814563f0f1f7665796735a8049ec295414e Mon Sep 17 00:00:00 2001
From: Georgiana Dolocan <georgiana.dolocan@gmail.com>
Date: Tue, 5 Nov 2024 14:54:55 +0200
Subject: [PATCH 1/3] Add hub-name tags to buckets

---
 terraform/aws/projects/2i2c-aws-us.tfvars | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/terraform/aws/projects/2i2c-aws-us.tfvars b/terraform/aws/projects/2i2c-aws-us.tfvars
index 6e7f0aa7bb..429331a534 100644
--- a/terraform/aws/projects/2i2c-aws-us.tfvars
+++ b/terraform/aws/projects/2i2c-aws-us.tfvars
@@ -4,22 +4,28 @@ cluster_nodes_location = "us-west-2a"
 
 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" },
   },
 }
 

From 63154fa42405d08a1048f84916b2980d28df2c56 Mon Sep 17 00:00:00 2001
From: Georgiana Dolocan <georgiana.dolocan@gmail.com>
Date: Wed, 6 Nov 2024 11:25:33 +0200
Subject: [PATCH 2/3] Enable aws-ce-grafana backend

---
 terraform/aws/projects/2i2c-aws-us.tfvars | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/terraform/aws/projects/2i2c-aws-us.tfvars b/terraform/aws/projects/2i2c-aws-us.tfvars
index 429331a534..12a809ee95 100644
--- a/terraform/aws/projects/2i2c-aws-us.tfvars
+++ b/terraform/aws/projects/2i2c-aws-us.tfvars
@@ -2,6 +2,8 @@ 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,

From ac9060b8ca0971fb8b8bd2baf39be5f1186c017c Mon Sep 17 00:00:00 2001
From: Georgiana Dolocan <georgiana.dolocan@gmail.com>
Date: Wed, 6 Nov 2024 11:25:45 +0200
Subject: [PATCH 3/3] Configure aws-ce-grafana backend

---
 config/clusters/2i2c-aws-us/support.values.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/clusters/2i2c-aws-us/support.values.yaml b/config/clusters/2i2c-aws-us/support.values.yaml
index a8dac825c3..65efefe7eb 100644
--- 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: