Correct param values

Sage-Bionetworks-Workflows · Jul 11, 2024 · c896b61 · c896b61
1 parent a79cd14
commit c896b61
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/dev/stacks/dpe-sandbox-k8s/main.tf b/dev/stacks/dpe-sandbox-k8s/main.tf
@@ -6,11 +6,11 @@ module "sage-aws-vpc" {
 
 module "sage-aws-eks" {
   source  = "spacelift.io/sagebionetworks/sage-aws-eks/aws"
-  version = "0.2.5"
-
-  cluster_name           = "dpe-k8-sandbox"
-  private_vpc_subnet_ids = module.sage-aws-vpc.private_subnet_ids
-  vpc_id                 = module.sage-aws-vpc.vpc_id
-  vpc_security_group_id  = module.sage-aws-vpc.vpc_security_group_id
+  version = "0.2.6"
 
+  cluster_name             = "dpe-k8-sandbox"
+  private_vpc_subnet_ids   = module.sage-aws-vpc.private_subnet_ids
+  vpc_id                   = module.sage-aws-vpc.vpc_id
+  vpc_security_group_id    = module.sage-aws-vpc.vpc_security_group_id
+  enable_policy_event_logs = true
 }
diff --git a/modules/main.tf b/modules/main.tf
@@ -37,7 +37,7 @@ resource "spacelift_module" "sage-aws-eks" {
 
 resource "spacelift_version" "sage-aws-eks-version" {
   module_id      = spacelift_module.sage-aws-eks.id
-  version_number = "0.2.5"
+  version_number = "0.2.6"
 }
 
 resource "spacelift_module" "sage-aws-eks-autoscaler" {

diff --git a/modules/sage-aws-eks/main.tf b/modules/sage-aws-eks/main.tf
@@ -57,15 +57,16 @@ module "eks" {
     }
     vpc-cni = {
       most_recent = true
+      # Derived from https://github.com/aws/amazon-vpc-cni-k8s/blob/master/charts/aws-vpc-cni/values.yaml
       configuration_values = jsonencode({
         enableNetworkPolicy = "true",
         init = {
           env = {
             DISABLE_TCP_EARLY_DEMUX = "true"
           }
         }
-        nodeagent = {
-          enablePolicyEventLogs = "true"
+        nodeAgent = {
+          enablePolicyEventLogs = var.enable_policy_event_logs ? "true" : "false"
         }
         env = {
           ENABLE_POD_ENI                    = "true",

diff --git a/modules/sage-aws-eks/variables.tf b/modules/sage-aws-eks/variables.tf
@@ -38,3 +38,9 @@ variable "vpc_security_group_id" {
   description = "Security group ID to attach to the EKS cluster"
   type        = string
 }
+
+variable "enable_policy_event_logs" {
+  description = "Enable logging of policy events"
+  type        = bool
+  default     = false
+}