From 65263a6fce3ab05dd14317264ba5aadcb5269836 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 6 Nov 2024 11:48:13 +0200 Subject: [PATCH 1/3] Add hub-name tags to buckets --- terraform/aws/projects/catalystproject-africa.tfvars | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/terraform/aws/projects/catalystproject-africa.tfvars b/terraform/aws/projects/catalystproject-africa.tfvars index 32651d91cf..aa140aadde 100644 --- a/terraform/aws/projects/catalystproject-africa.tfvars +++ b/terraform/aws/projects/catalystproject-africa.tfvars @@ -4,13 +4,16 @@ cluster_nodes_location = "af-south-1a" 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" }, }, "persistent-bhki" : { - "delete_after" : null + "delete_after" : null, + "tags" : { "2i2c:hub-name" : "bhki" }, }, } From a05eec8e2692eca5f4d12f8bb66e1d4bad7d2f07 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 6 Nov 2024 11:59:12 +0200 Subject: [PATCH 2/3] Enable aws-ce-grafana backend --- terraform/aws/projects/catalystproject-africa.tfvars | 2 ++ 1 file changed, 2 insertions(+) diff --git a/terraform/aws/projects/catalystproject-africa.tfvars b/terraform/aws/projects/catalystproject-africa.tfvars index aa140aadde..28df57bade 100644 --- a/terraform/aws/projects/catalystproject-africa.tfvars +++ b/terraform/aws/projects/catalystproject-africa.tfvars @@ -2,6 +2,8 @@ region = "af-south-1" cluster_name = "catalystproject-africa" cluster_nodes_location = "af-south-1a" +enable_aws_ce_grafana_backend_iam = true + user_buckets = { "scratch-staging" : { "delete_after" : 7, From 5ade15aa3806a2dcc2b9396ec7b0c333b029fd4b Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Wed, 6 Nov 2024 11:59:31 +0200 Subject: [PATCH 3/3] Configure aws-ce-grafana backend --- .../clusters/catalystproject-africa/support.values.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/clusters/catalystproject-africa/support.values.yaml b/config/clusters/catalystproject-africa/support.values.yaml index 4750194262..96e0d70f26 100644 --- a/config/clusters/catalystproject-africa/support.values.yaml +++ b/config/clusters/catalystproject-africa/support.values.yaml @@ -32,3 +32,11 @@ prometheus: - secretName: prometheus-tls hosts: - prometheus.af.catalystproject.2i2c.cloud + +aws-ce-grafana-backend: + enabled: true + envBasedConfig: + clusterName: catalystproject-africa + serviceAccount: + annotations: + eks.amazonaws.com/role-arn: arn:aws:iam::495928966746:role/aws_ce_grafana_backend_iam_role