merging

ExpediaGroup · Jun 28, 2024 · c4ae518 · c4ae518
1 parent 4eded0e
commit c4ae518
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/k8s-readonly.tf b/k8s-readonly.tf
@@ -45,16 +45,18 @@ resource "kubernetes_deployment_v1" "apiary_hms_readonly" {
         dynamic "security_context"  {
           for_each = var.enable_sysctl_config_in_eks ? ["enabled"] : []
           content {
-            sysctl = [{
+            sysctl {
               name="net.ipv4.tcp_keepalive_time"
               value="${var.tcp_keepalive_time}"
-            },{
+            }
+            sysctl {
               name="net.ipv4.tcp_keepalive_intvl"
               value="${var.tcp_keepalive_intvl}"
-            },{
+            }
+            sysctl {
               name="net.ipv4.tcp_keepalive_probes"
               value="${var.tcp_keepalive_probes}"
-            }]
+            }
           }
         }
         dynamic "init_container" {

diff --git a/templates.tf b/templates.tf
@@ -69,6 +69,9 @@ locals{
     datadog_agent_version = var.datadog_agent_version
     datadog_agent_enabled = var.datadog_agent_enabled
     datadog_tags          = local.datadog_tags
+    tcp_keepalive_time     = var.tcp_keepalive_time
+    tcp_keepalive_intvl    = var.tcp_keepalive_intvl
+    tcp_keepalive_probes   = var.tcp_keepalive_probes
   })
 
   hms_readonly_template = templatefile("${path.module}/templates/apiary-hms-readonly.json", {
@@ -120,5 +123,8 @@ locals{
     metrics_port          = var.datadog_metrics_port
     datadog_agent_version = var.datadog_agent_version
     datadog_tags          = local.datadog_tags
+    tcp_keepalive_time     = var.tcp_keepalive_time
+    tcp_keepalive_intvl    = var.tcp_keepalive_intvl
+    tcp_keepalive_probes   = var.tcp_keepalive_probes
   })
 }