From faba38dd5acf4519f70dceaf7f99687c87203983 Mon Sep 17 00:00:00 2001 From: Shibra Amin Date: Wed, 29 Nov 2023 20:14:14 +0530 Subject: [PATCH 1/5] added condition for defectdojo --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index 36d4b1d..9f40691 100644 --- a/main.tf +++ b/main.tf @@ -422,6 +422,7 @@ resource "helm_release" "metrics-server-vpa" { #defectdojo resource "kubernetes_namespace" "defectdojo" { + count = var.defectdojo_enabled ? 1 : 0 metadata { name = "defectdojo" } From e94a088d51eae96489cfd6b62421c3f49e382617 Mon Sep 17 00:00:00 2001 From: Shibra Amin Date: Thu, 7 Dec 2023 10:17:24 +0530 Subject: [PATCH 2/5] Update aws_nth.yaml --- modules/aws_node_termination_handler/aws_nth.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modules/aws_node_termination_handler/aws_nth.yaml b/modules/aws_node_termination_handler/aws_nth.yaml index d02f5d6..8dd2dd7 100644 --- a/modules/aws_node_termination_handler/aws_nth.yaml +++ b/modules/aws_node_termination_handler/aws_nth.yaml @@ -4,16 +4,6 @@ enablePrometheusServer: ${enable_service_monitor} podAnnotations: co.elastic.logs/enabled: "true" -affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "Addons-Services" - operator: In - values: - - "true" - resources: limits: cpu: 50m From 0ce01a7eb8e663940b598876d32d83f337578b66 Mon Sep 17 00:00:00 2001 From: Shibra Amin Date: Thu, 7 Dec 2023 10:20:46 +0530 Subject: [PATCH 3/5] Update main.tf --- modules/kubernetes-addons/aws-ebs-csi-driver/main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/kubernetes-addons/aws-ebs-csi-driver/main.tf b/modules/kubernetes-addons/aws-ebs-csi-driver/main.tf index fa2929b..0b04910 100644 --- a/modules/kubernetes-addons/aws-ebs-csi-driver/main.tf +++ b/modules/kubernetes-addons/aws-ebs-csi-driver/main.tf @@ -18,7 +18,6 @@ resource "aws_eks_addon" "aws_ebs_csi_driver" { cluster_name = var.addon_context.eks_cluster_id addon_name = local.name addon_version = try(var.addon_config.addon_version, data.aws_eks_addon_version.this.version) - resolve_conflicts_on_create = "OVERWRITE" service_account_role_arn = local.create_irsa ? module.irsa_addon[0].irsa_iam_role_arn : try(var.addon_config.service_account_role_arn, null) preserve = try(var.addon_config.preserve, true) From eb7109631d980703af34814747325596d47dd920 Mon Sep 17 00:00:00 2001 From: Shibra Amin Date: Thu, 7 Dec 2023 10:21:10 +0530 Subject: [PATCH 4/5] Update main.tf --- modules/kubernetes-addons/aws-vpc-cni/main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/kubernetes-addons/aws-vpc-cni/main.tf b/modules/kubernetes-addons/aws-vpc-cni/main.tf index abbbe44..6ac5e0c 100644 --- a/modules/kubernetes-addons/aws-vpc-cni/main.tf +++ b/modules/kubernetes-addons/aws-vpc-cni/main.tf @@ -15,7 +15,6 @@ resource "aws_eks_addon" "vpc_cni" { cluster_name = var.addon_context.eks_cluster_id addon_name = local.name addon_version = try(var.addon_config.addon_version, data.aws_eks_addon_version.this.version) - resolve_conflicts_on_create = "OVERWRITE" service_account_role_arn = local.create_irsa ? module.irsa_addon[0].irsa_iam_role_arn : try(var.addon_config.service_account_role_arn, null) preserve = try(var.addon_config.preserve, true) From 4a4943c653197b17d2d8fa43a22e469ac584f445 Mon Sep 17 00:00:00 2001 From: Shibra Amin Date: Thu, 7 Dec 2023 10:21:43 +0530 Subject: [PATCH 5/5] Update main.tf --- main.tf | 1 - 1 file changed, 1 deletion(-) diff --git a/main.tf b/main.tf index 31a1384..2aade38 100644 --- a/main.tf +++ b/main.tf @@ -308,7 +308,6 @@ resource "aws_eks_addon" "kubecost" { cluster_name = var.eks_cluster_name addon_name = "kubecost_kubecost" addon_version = data.aws_eks_addon_version.kubecost.version - resolve_conflicts_on_create = "OVERWRITE" service_account_role_arn = var.worker_iam_role_arn preserve = true