Skip to content

Commit 2d07f1c

Browse files
authored
refactor: update for latest iam modules - requires recreation of the policy due to new name format (#81)
1 parent b2bab71 commit 2d07f1c

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed

main.tf

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,13 @@ module "karpenter" {
218218

219219
# IAM roles and policies for the cluster
220220
module "load_balancer_controller_irsa_role" {
221-
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
222-
version = "5.60.0"
221+
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts"
222+
version = "6.3.0"
223223

224-
create_role = var.stack_create
224+
use_name_prefix = false
225+
name = "${var.stack_name}-alb-role"
226+
policy_name = "AmazonEKS_AWS_Load_Balancer_Controller-${var.stack_name}"
225227

226-
role_name = "${var.stack_name}-alb-role"
227228
attach_load_balancer_controller_policy = true
228229

229230
oidc_providers = {
@@ -237,12 +238,13 @@ module "load_balancer_controller_irsa_role" {
237238
}
238239

239240
module "ebs_csi_driver_irsa_role" {
240-
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
241-
version = "5.60.0"
241+
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts"
242+
version = "6.3.0"
242243

243-
create_role = var.stack_create
244+
use_name_prefix = false
245+
name = "${var.stack_name}-ebs-csi-driver-role"
246+
policy_name = "AmazonEKS_EBS_CSI_Policy-${var.stack_name}"
244247

245-
role_name = "${var.stack_name}-ebs-csi-driver-role"
246248
attach_ebs_csi_policy = true
247249

248250
oidc_providers = {
@@ -278,12 +280,14 @@ module "s3_csi" {
278280
}
279281

280282
module "s3_driver_irsa_role" {
281-
count = var.stack_create ? 1 : 0
282-
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
283-
version = "5.60.0"
284-
create_role = var.stack_create
283+
count = var.stack_create ? 1 : 0
284+
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts"
285+
version = "6.3.0"
286+
287+
use_name_prefix = false
288+
name = "${var.stack_name}-s3-csi-driver-role"
289+
policy_name = "AmazonEKS_Mountpoint_S3_CSI-${var.stack_name}"
285290

286-
role_name = "${var.stack_name}-s3-csi-driver-role"
287291
attach_mountpoint_s3_csi_policy = true
288292
mountpoint_s3_csi_bucket_arns = local.s3_csi_arns
289293
mountpoint_s3_csi_path_arns = [for arn in local.s3_csi_arns : "${arn}/*"]
@@ -299,12 +303,13 @@ module "s3_driver_irsa_role" {
299303

300304
module "external_dns_irsa_role" {
301305
count = var.stack_create ? 1 : 0
302-
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
303-
version = "5.60.0"
306+
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts"
307+
version = "6.3.0"
304308

305-
create_role = var.stack_create
309+
use_name_prefix = false
310+
name = "${var.stack_name}-external-dns-role"
311+
policy_name = "AmazonEKS_External_DNS_Policy-${var.stack_name}"
306312

307-
role_name = "${var.stack_name}-external-dns-role"
308313
attach_external_dns_policy = true
309314
external_dns_hosted_zone_arns = ["*"]
310315

@@ -318,14 +323,16 @@ module "external_dns_irsa_role" {
318323
})
319324
}
320325

326+
321327
module "cert_manager_irsa_role" {
322328
count = var.stack_create ? 1 : 0
323-
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
324-
version = "5.60.0"
329+
source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts"
330+
version = "6.3.0"
325331

326-
create_role = var.stack_create
332+
use_name_prefix = false
333+
name = "${var.stack_name}-cert-manager-role"
334+
policy_name = "AmazonEKS_Cert_Manager_Policy-${var.stack_name}"
327335

328-
role_name = "${var.stack_name}-cert-manager-role"
329336
attach_cert_manager_policy = true
330337
cert_manager_hosted_zone_arns = ["*"]
331338

0 commit comments

Comments
 (0)