xpk/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/terraform-aws-modules/terraform-aws-eks.git synced 2025-09-09 19:32:58 +08:00
Code Activity

fix: Correct addon timeout lookup/override logic to support global and addon specific settings (#3492)

Browse Source
This commit is contained in:
Bryant Biggs
2025-08-24 13:16:17 -05:00
committed by GitHub
parent b02727a652
commit b236208d5c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.tf
+6 -6
View File
@@ -785,9 +785,9 @@ resource "aws_eks_addon" "this" {
service_account_role_arn = each.value.service_account_role_arn
timeouts {
create = try(coalesce(each.value.timeouts.create, var.addons_timeouts.create), null)
update = try(coalesce(each.value.timeouts.update, var.addons_timeouts.update), null)
delete = try(coalesce(each.value.timeouts.delete, var.addons_timeouts.delete), null)
create = each.value.timeouts.create != null ? each.value.timeouts.create : var.addons_timeouts.create
update = each.value.timeouts.update != null ? each.value.timeouts.update : var.addons_timeouts.update
delete = each.value.timeouts.delete != null ? each.value.timeouts.delete : var.addons_timeouts.delete
}
tags = merge(
@@ -830,9 +830,9 @@ resource "aws_eks_addon" "before_compute" {
service_account_role_arn = each.value.service_account_role_arn
timeouts {
create = try(coalesce(each.value.timeouts.create, var.addons_timeouts.create), null)
update = try(coalesce(each.value.timeouts.update, var.addons_timeouts.update), null)
delete = try(coalesce(each.value.timeouts.delete, var.addons_timeouts.delete), null)
create = each.value.timeouts.create != null ? each.value.timeouts.create : var.addons_timeouts.create
update = each.value.timeouts.update != null ? each.value.timeouts.update : var.addons_timeouts.update
delete = each.value.timeouts.delete != null ? each.value.timeouts.delete : var.addons_timeouts.delete
}
tags = merge(