diff --git a/README.md b/README.md index 9d8e381..221e630 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ module "monitoring" { | Name | Source | Version | |------|--------|---------| -| [iam\_assumable\_role\_monitoring](#module\_iam\_assumable\_role\_monitoring) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | 3.13.0 | -| [iam\_assumable\_role\_yace\_cloudwatch\_exporter](#module\_iam\_assumable\_role\_yace\_cloudwatch\_exporter) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | 4.24.1 | +| [iam\_assumable\_role\_monitoring](#module\_iam\_assumable\_role\_monitoring) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | 5.52.1 | +| [iam\_assumable\_role\_yace\_cloudwatch\_exporter](#module\_iam\_assumable\_role\_yace\_cloudwatch\_exporter) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | 5.52.1 | | [irsa](#module\_irsa) | github.com/ministryofjustice/cloud-platform-terraform-irsa | 2.0.0 | | [rds\_exporter\_irsa](#module\_rds\_exporter\_irsa) | github.com/ministryofjustice/cloud-platform-terraform-irsa | 2.0.0 | | [subnet\_exporter\_irsa](#module\_subnet\_exporter\_irsa) | github.com/ministryofjustice/cloud-platform-terraform-irsa | 2.0.0 | diff --git a/prometheus.tf b/prometheus.tf index 76c6cf7..9ca8aaa 100644 --- a/prometheus.tf +++ b/prometheus.tf @@ -51,7 +51,7 @@ resource "helm_release" "prometheus_operator_eks" { large_nodesgroup_cpu_requests = var.large_nodesgroup_cpu_requests large_nodesgroup_memory_requests = var.large_nodesgroup_memory_requests prometheus_sa_name = local.prometheus_sa_name - eks_service_account = module.iam_assumable_role_monitoring.this_iam_role_arn + eks_service_account = module.iam_assumable_role_monitoring.iam_role_arn storage_class = can(regex("live", terraform.workspace)) ? "io1-expand" : "gp2-expand" storage_size = can(regex("live", terraform.workspace)) ? "750Gi" : "75Gi" })] diff --git a/thanos.tf b/thanos.tf index 6edab24..dce5c1b 100644 --- a/thanos.tf +++ b/thanos.tf @@ -10,7 +10,7 @@ resource "helm_release" "thanos" { values = [templatefile("${path.module}/templates/thanos-values.yaml.tpl", { prometheus_sa_name = local.prometheus_sa_name enabled_compact = var.enable_thanos_compact - monitoring_aws_role = module.iam_assumable_role_monitoring.this_iam_role_name + monitoring_aws_role = module.iam_assumable_role_monitoring.iam_role_name clusterName = terraform.workspace })] @@ -68,7 +68,7 @@ data "aws_iam_policy_document" "monitoring" { # IRSA module "iam_assumable_role_monitoring" { source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc" - version = "3.13.0" + version = "5.52.1" create_role = true role_name = "monitoring.${var.cluster_domain_name}" provider_url = var.eks_cluster_oidc_issuer_url diff --git a/yace-cloudwatch-exporter.tf b/yace-cloudwatch-exporter.tf index 585f95d..681d7bf 100644 --- a/yace-cloudwatch-exporter.tf +++ b/yace-cloudwatch-exporter.tf @@ -37,7 +37,7 @@ data "aws_iam_policy_document" "yace_cloudwatch_exporter" { module "iam_assumable_role_yace_cloudwatch_exporter" { source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc" - version = "4.24.1" + version = "5.52.1" create_role = var.enable_cloudwatch_exporter ? true : false role_name = "yace.${var.cluster_domain_name}" provider_url = var.eks_cluster_oidc_issuer_url