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 logic lookup to pull latest addon version (#3449)

Browse Source
This commit is contained in:
Bryant Biggs
2025-07-29 10:40:12 -05:00
committed by GitHub
parent 074abf1409
commit 55d7fa23a3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.tf
+8 -8
View File
@@ -766,7 +766,7 @@ resource "aws_eks_addon" "this" {
cluster_name = aws_eks_cluster.this[0].id cluster_name = aws_eks_cluster.this[0].id
addon_name = coalesce(each.value.name, each.key) addon_name = coalesce(each.value.name, each.key)
addon_version = try(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version) addon_version = coalesce(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version)
configuration_values = each.value.configuration_values configuration_values = each.value.configuration_values
dynamic "pod_identity_association" { dynamic "pod_identity_association" {
@@ -784,9 +784,9 @@ resource "aws_eks_addon" "this" {
service_account_role_arn = each.value.service_account_role_arn service_account_role_arn = each.value.service_account_role_arn
timeouts { timeouts {
create = try(each.value.timeouts.create, var.addons_timeouts.create, null) create = try(coalesce(each.value.timeouts.create, var.addons_timeouts.create), null)
update = try(each.value.timeouts.update, var.addons_timeouts.update, null) update = try(coalesce(each.value.timeouts.update, var.addons_timeouts.update), null)
delete = try(each.value.timeouts.delete, var.addons_timeouts.delete, null) delete = try(coalesce(each.value.timeouts.delete, var.addons_timeouts.delete), null)
} }
tags = merge( tags = merge(
@@ -811,7 +811,7 @@ resource "aws_eks_addon" "before_compute" {
cluster_name = aws_eks_cluster.this[0].id cluster_name = aws_eks_cluster.this[0].id
addon_name = coalesce(each.value.name, each.key) addon_name = coalesce(each.value.name, each.key)
addon_version = try(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version) addon_version = coalesce(each.value.addon_version, data.aws_eks_addon_version.this[each.key].version)
configuration_values = each.value.configuration_values configuration_values = each.value.configuration_values
dynamic "pod_identity_association" { dynamic "pod_identity_association" {
@@ -829,9 +829,9 @@ resource "aws_eks_addon" "before_compute" {
service_account_role_arn = each.value.service_account_role_arn service_account_role_arn = each.value.service_account_role_arn
timeouts { timeouts {
create = try(each.value.timeouts.create, var.addons_timeouts.create, null) create = try(coalesce(each.value.timeouts.create, var.addons_timeouts.create), null)
update = try(each.value.timeouts.update, var.addons_timeouts.update, null) update = try(coalesce(each.value.timeouts.update, var.addons_timeouts.update), null)
delete = try(each.value.timeouts.delete, var.addons_timeouts.delete, null) delete = try(coalesce(each.value.timeouts.delete, var.addons_timeouts.delete), null)
} }
tags = merge( tags = merge(