Enhance EKS addons module: update source path and add GuardDuty addon version and conflict resolution

Author: BryanFauble

deployments/stacks/dpe-k8s-deployments/main.tf

@@ -13,8 +13,7 @@ module "sage-aws-eks-autoscaler" {
 }
 
 module "sage-aws-eks-addons" {
-  source             = "spacelift.io/sagebionetworks/sage-aws-eks-addons/aws"
-  version            = "0.3.0"
+  source             = "../../../modules/sage-aws-eks-addons"
   cluster_name       = var.cluster_name
   aws_account_id     = var.aws_account_id
   vpc_id             = var.vpc_id

modules/sage-aws-eks-addons/main.tf

@@ -88,7 +88,11 @@ data "aws_iam_policy_document" "restrict-vpc-endpoint-usage" {
 
 
 resource "aws_eks_addon" "aws-guardduty" {
-  cluster_name = var.cluster_name
-  addon_name   = "aws-guardduty-agent"
-  tags         = var.tags
+  cluster_name                = var.cluster_name
+  addon_name                  = "aws-guardduty-agent"
+  tags                        = var.tags
+  addon_version               = "v1.11.0-eksbuild.4"
+  resolve_conflicts_on_update = "OVERWRITE"
+  resolve_conflicts_on_create = "OVERWRITE"
 }
+