@@ -766,7 +766,7 @@ resource "aws_eks_addon" "this" {
766766 cluster_name = aws_eks_cluster. this [0 ]. id
767767 addon_name = coalesce (each. value . name , each. key )
768768
769- addon_version = try (each. value . addon_version , data. aws_eks_addon_version . this [each . key ]. version )
769+ addon_version = coalesce (each. value . addon_version , data. aws_eks_addon_version . this [each . key ]. version )
770770 configuration_values = each. value . configuration_values
771771
772772 dynamic "pod_identity_association" {
@@ -784,9 +784,9 @@ resource "aws_eks_addon" "this" {
784784 service_account_role_arn = each. value . service_account_role_arn
785785
786786 timeouts {
787- create = try (each. value . timeouts . create , var. addons_timeouts . create , null )
788- update = try (each. value . timeouts . update , var. addons_timeouts . update , null )
789- delete = try (each. value . timeouts . delete , var. addons_timeouts . delete , null )
787+ create = try (coalesce ( each. value . timeouts . create , var. addons_timeouts . create ) , null )
788+ update = try (coalesce ( each. value . timeouts . update , var. addons_timeouts . update ) , null )
789+ delete = try (coalesce ( each. value . timeouts . delete , var. addons_timeouts . delete ) , null )
790790 }
791791
792792 tags = merge (
@@ -811,7 +811,7 @@ resource "aws_eks_addon" "before_compute" {
811811 cluster_name = aws_eks_cluster. this [0 ]. id
812812 addon_name = coalesce (each. value . name , each. key )
813813
814- addon_version = try (each. value . addon_version , data. aws_eks_addon_version . this [each . key ]. version )
814+ addon_version = coalesce (each. value . addon_version , data. aws_eks_addon_version . this [each . key ]. version )
815815 configuration_values = each. value . configuration_values
816816
817817 dynamic "pod_identity_association" {
@@ -829,9 +829,9 @@ resource "aws_eks_addon" "before_compute" {
829829 service_account_role_arn = each. value . service_account_role_arn
830830
831831 timeouts {
832- create = try (each. value . timeouts . create , var. addons_timeouts . create , null )
833- update = try (each. value . timeouts . update , var. addons_timeouts . update , null )
834- delete = try (each. value . timeouts . delete , var. addons_timeouts . delete , null )
832+ create = try (coalesce ( each. value . timeouts . create , var. addons_timeouts . create ) , null )
833+ update = try (coalesce ( each. value . timeouts . update , var. addons_timeouts . update ) , null )
834+ delete = try (coalesce ( each. value . timeouts . delete , var. addons_timeouts . delete ) , null )
835835 }
836836
837837 tags = merge (
0 commit comments