diff --git a/deployments/stacks/dpe-k8s-deployments/main.tf b/deployments/stacks/dpe-k8s-deployments/main.tf index 36145a0a..0a4b9b04 100644 --- a/deployments/stacks/dpe-k8s-deployments/main.tf +++ b/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 diff --git a/modules/sage-aws-eks-addons/main.tf b/modules/sage-aws-eks-addons/main.tf index 14d7f0b7..ed044d20 100644 --- a/modules/sage-aws-eks-addons/main.tf +++ b/modules/sage-aws-eks-addons/main.tf @@ -75,7 +75,7 @@ data "aws_iam_policy_document" "restrict-vpc-endpoint-usage" { condition { test = "StringNotEquals" - variable = "aws:Principal" + variable = "aws:PrincipalAccount" values = [var.aws_account_id] } @@ -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" } +