From ec03e9829bc3e4bcc3a1100e61a15ab2f68b238c Mon Sep 17 00:00:00 2001
From: Maria Shaldybin <maria.shaldybin@broadcom.com>
Date: Mon, 9 Sep 2024 22:02:28 +0000
Subject: [PATCH] Allow to configure read-header-timeout

---
 jobs/garden-windows/spec                         | 4 ++++
 jobs/garden-windows/templates/garden_ctl.ps1.erb | 1 +
 jobs/garden/spec                                 | 4 ++++
 jobs/garden/templates/config/config.ini.erb      | 1 +
 spec/jobs/garden_spec.rb                         | 4 ++++
 5 files changed, 14 insertions(+)

diff --git a/jobs/garden-windows/spec b/jobs/garden-windows/spec
index 004e4e7f4..74f545db2 100644
--- a/jobs/garden-windows/spec
+++ b/jobs/garden-windows/spec
@@ -36,6 +36,10 @@ properties:
     description: "An array of additional arguments which will be passed to the runtime plugin binary"
     default: []
 
+  garden.read_header_timeout:
+    description: "The amount of time allowed to read request headers"
+    default: 30s
+
   garden.image_plugin:
     description: "Path to an image plugin binary"
 
diff --git a/jobs/garden-windows/templates/garden_ctl.ps1.erb b/jobs/garden-windows/templates/garden_ctl.ps1.erb
index 23c662e9b..773a24713 100644
--- a/jobs/garden-windows/templates/garden_ctl.ps1.erb
+++ b/jobs/garden-windows/templates/garden_ctl.ps1.erb
@@ -32,6 +32,7 @@ C:\var\vcap\packages\guardian-windows\gdn.exe `
   server `
   --skip-setup `
   --depot=$depotDir `
+  --read-header-timeout=<%= p("garden.read_header_timeout") %> `
   --log-level=<%= p("garden.log_level") %> `
   <% ip, port = p("garden.listen_address").split(":") %> `
   --bind-ip=<%= ip %> `
diff --git a/jobs/garden/spec b/jobs/garden/spec
index 093e53e1a..5a78d3571 100644
--- a/jobs/garden/spec
+++ b/jobs/garden/spec
@@ -128,6 +128,10 @@ properties:
     description: "Path to a runtime plugin binary"
     default: /var/vcap/packages/runc/bin/runc
 
+  garden.read_header_timeout:
+    description: "The amount of time allowed to read request headers"
+    default: 30s
+
   garden.no_image_plugin:
     description: "If true, disables image plugin usage, thus ignoring other image plugin settings"
     default: false
diff --git a/jobs/garden/templates/config/config.ini.erb b/jobs/garden/templates/config/config.ini.erb
index cc26fa27b..a4c909fe1 100644
--- a/jobs/garden/templates/config/config.ini.erb
+++ b/jobs/garden/templates/config/config.ini.erb
@@ -241,6 +241,7 @@ parse_ip(p('garden.network_pool'), 'garden.network_pool')
   skip-setup = true
   depot = /var/vcap/data/garden/depot
   runtime-plugin=<%= p("garden.runtime_plugin") %>
+  read-header-timeout = <%= p("garden.read_header_timeout") %>
 
 <% if p("garden.containerd_mode") -%>
 ; containerd
diff --git a/spec/jobs/garden_spec.rb b/spec/jobs/garden_spec.rb
index 8fe922667..a9a104199 100644
--- a/spec/jobs/garden_spec.rb
+++ b/spec/jobs/garden_spec.rb
@@ -79,6 +79,10 @@
         expect(rendered_template['server']['runtime-plugin']).to eql('/var/vcap/packages/runc/bin/runc')
       end
 
+      it 'sets the read header timeout to 30s' do
+        expect(rendered_template['server']['read-header-timeout']).to eql('30s')
+      end
+
       it 'sets the max containers to 250' do
         expect(rendered_template['server']['max-containers']).to eql(250)
       end