From 985a1f300e48caf39252b971eabad94ab32503b9 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 6 Nov 2024 14:03:18 +0200 Subject: [PATCH] opensci: enable and configure aws-ce-grafana backend --- config/clusters/opensci/support.values.yaml | 8 ++++++++ terraform/aws/projects/opensci.tfvars | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/config/clusters/opensci/support.values.yaml b/config/clusters/opensci/support.values.yaml index d1d7ba1c91..29faa01139 100644 --- a/config/clusters/opensci/support.values.yaml +++ b/config/clusters/opensci/support.values.yaml @@ -32,3 +32,11 @@ grafana: - secretName: grafana-tls hosts: - grafana.opensci.2i2c.cloud + +aws-ce-grafana-backend: + enabled: true + envBasedConfig: + clusterName: opensci + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: arn:aws:iam::211125293633:role/aws_ce_grafana_backend_iam_role diff --git a/terraform/aws/projects/opensci.tfvars b/terraform/aws/projects/opensci.tfvars index db6fa3729f..b69eefbce2 100644 --- a/terraform/aws/projects/opensci.tfvars +++ b/terraform/aws/projects/opensci.tfvars @@ -2,15 +2,20 @@ region = "us-west-2" cluster_name = "opensci" 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-sciencecore" : { - "delete_after" : 7 + "delete_after" : 7, + "tags" : { "2i2c:hub-name" : "sciencecore" }, }, "persistent-sciencecore" : { - "delete_after" : null + "delete_after" : null, + "tags" : { "2i2c:hub-name" : "sciencecore" }, }, }