Skip to content

Commit

Permalink
Merge pull request #316 from ministryofjustice/bump-iam-modules
Browse files Browse the repository at this point in the history
Bump iam modules
  • Loading branch information
sj-williams authored Jan 8, 2025
2 parents 028c4ec + 117d8ad commit bd55cb2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ module "monitoring" {

| Name | Source | Version |
|------|--------|---------|
| <a name="module_iam_assumable_role_monitoring"></a> [iam\_assumable\_role\_monitoring](#module\_iam\_assumable\_role\_monitoring) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | 3.13.0 |
| <a name="module_iam_assumable_role_yace_cloudwatch_exporter"></a> [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 |
| <a name="module_iam_assumable_role_monitoring"></a> [iam\_assumable\_role\_monitoring](#module\_iam\_assumable\_role\_monitoring) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | 5.52.1 |
| <a name="module_iam_assumable_role_yace_cloudwatch_exporter"></a> [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 |
| <a name="module_irsa"></a> [irsa](#module\_irsa) | github.com/ministryofjustice/cloud-platform-terraform-irsa | 2.0.0 |
| <a name="module_rds_exporter_irsa"></a> [rds\_exporter\_irsa](#module\_rds\_exporter\_irsa) | github.com/ministryofjustice/cloud-platform-terraform-irsa | 2.0.0 |
| <a name="module_subnet_exporter_irsa"></a> [subnet\_exporter\_irsa](#module\_subnet\_exporter\_irsa) | github.com/ministryofjustice/cloud-platform-terraform-irsa | 2.0.0 |
Expand Down
2 changes: 1 addition & 1 deletion prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
})]
Expand Down
4 changes: 2 additions & 2 deletions thanos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
})]

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion yace-cloudwatch-exporter.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bd55cb2

Please sign in to comment.