From b14ba1525a11762f1de4f0a953b73b59665f9f0f Mon Sep 17 00:00:00 2001 From: Aditya Choudhari Date: Mon, 17 Jun 2024 14:57:51 -0700 Subject: [PATCH] fix: Revert resolve conflicts var --- modules/app_eks/add-ons.tf | 47 +++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/modules/app_eks/add-ons.tf b/modules/app_eks/add-ons.tf index 69b2ff49..41c9cc8f 100644 --- a/modules/app_eks/add-ons.tf +++ b/modules/app_eks/add-ons.tf @@ -34,51 +34,46 @@ resource "aws_eks_addon" "aws_efs_csi_driver" { depends_on = [ aws_eks_addon.vpc_cni ] - cluster_name = var.namespace - addon_name = "aws-efs-csi-driver" - addon_version = "v1.7.7-eksbuild.1" - resolve_conflicts_on_create = "OVERWRITE" - resolve_conflicts_on_update = "OVERWRITE" + cluster_name = var.namespace + addon_name = "aws-efs-csi-driver" + addon_version = "v1.7.7-eksbuild.1" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "aws_ebs_csi_driver" { depends_on = [ aws_eks_addon.vpc_cni ] - cluster_name = var.namespace - addon_name = "aws-ebs-csi-driver" - addon_version = "v1.25.0-eksbuild.1" - resolve_conflicts_on_create = "OVERWRITE" - resolve_conflicts_on_update = "OVERWRITE" + cluster_name = var.namespace + addon_name = "aws-ebs-csi-driver" + addon_version = "v1.25.0-eksbuild.1" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "coredns" { depends_on = [ aws_eks_addon.vpc_cni ] - cluster_name = var.namespace - addon_name = "coredns" - addon_version = "v1.9.3-eksbuild.11" - resolve_conflicts_on_create = "OVERWRITE" - resolve_conflicts_on_update = "OVERWRITE" + cluster_name = var.namespace + addon_name = "coredns" + addon_version = "v1.9.3-eksbuild.11" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "kube_proxy" { depends_on = [ aws_eks_addon.vpc_cni ] - cluster_name = var.namespace - addon_name = "kube-proxy" - addon_version = "v1.25.14-eksbuild.2" - resolve_conflicts_on_create = "OVERWRITE" - resolve_conflicts_on_update = "OVERWRITE" + cluster_name = var.namespace + addon_name = "kube-proxy" + addon_version = "v1.25.14-eksbuild.2" + resolve_conflicts = "OVERWRITE" } resource "aws_eks_addon" "vpc_cni" { - cluster_name = var.namespace - addon_name = "vpc-cni" - addon_version = "v1.18.0-eksbuild.1" - resolve_conflicts_on_create = "OVERWRITE" - resolve_conflicts_on_update = "OVERWRITE" - service_account_role_arn = aws_iam_role.oidc.arn + cluster_name = var.namespace + addon_name = "vpc-cni" + addon_version = "v1.18.0-eksbuild.1" + resolve_conflicts = "OVERWRITE" + service_account_role_arn = aws_iam_role.oidc.arn }