From 7fe4a891b26519b81a06f4ec6b84e36fc1178111 Mon Sep 17 00:00:00 2001 From: I549758 Date: Wed, 15 Jan 2025 10:39:52 +0200 Subject: [PATCH 1/3] Adding 2 properties into the rep config for the liveness healthcheck for the envoy --- jobs/rep/spec | 6 ++++++ jobs/rep/templates/rep.json.erb | 2 ++ 2 files changed, 8 insertions(+) diff --git a/jobs/rep/spec b/jobs/rep/spec index 0737d9d1a3..7b83840822 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -134,6 +134,12 @@ properties: diego.executor.use_schedulable_disk_size: description: "Use total space available to containers reported by Garden. If false the total size of image plugin store minus max_cache_size_in_bytes is used." default: false + diego.executor.proxy_healthcheck_interval: + description: "Interval that checks envoy responsiveness every 30s." + default: 30 + diego.executor.enable_container_proxy_healthcheck: + description: "Healthcheck for the envoy container." + default: false diego.executor.garden.address: description: "Garden server listening address." default: /var/vcap/data/garden/garden.sock diff --git a/jobs/rep/templates/rep.json.erb b/jobs/rep/templates/rep.json.erb index 1cf981d081..a857bf490a 100644 --- a/jobs/rep/templates/rep.json.erb +++ b/jobs/rep/templates/rep.json.erb @@ -64,6 +64,8 @@ container_proxy_trusted_ca_certs: p("containers.proxy.trusted_ca_certificates"), container_proxy_verify_subject_alt_name: p("containers.proxy.verify_subject_alt_name"), container_proxy_ads_addresses: p("containers.proxy.ads_addresses"), + proxy_healthcheck_interval: p("diego.executor.proxy_healthcheck_interval") + enable_container_proxy_healthcheck: p("diego.executor.enable_container_proxy_healthcheck") advertise_preference_for_instance_address: p("diego.rep.advertise_preference_for_instance_address"), enable_unproxied_port_mappings: p("containers.proxy.enable_unproxied_port_mappings"), proxy_memory_allocation_mb: p("containers.proxy.additional_memory_allocation_mb"), From e14266cb684f8f4624102d34e892f20fa7e4df8e Mon Sep 17 00:00:00 2001 From: I549758 Date: Wed, 15 Jan 2025 17:58:09 +0200 Subject: [PATCH 2/3] fixing the properties --- jobs/rep/templates/rep.json.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/rep/templates/rep.json.erb b/jobs/rep/templates/rep.json.erb index a857bf490a..9348db6609 100644 --- a/jobs/rep/templates/rep.json.erb +++ b/jobs/rep/templates/rep.json.erb @@ -64,8 +64,8 @@ container_proxy_trusted_ca_certs: p("containers.proxy.trusted_ca_certificates"), container_proxy_verify_subject_alt_name: p("containers.proxy.verify_subject_alt_name"), container_proxy_ads_addresses: p("containers.proxy.ads_addresses"), - proxy_healthcheck_interval: p("diego.executor.proxy_healthcheck_interval") - enable_container_proxy_healthcheck: p("diego.executor.enable_container_proxy_healthcheck") + proxy_healthcheck_interval: p("diego.executor.proxy_healthcheck_interval"), + enable_container_proxy_healthcheck: p("diego.executor.enable_container_proxy_healthcheck"), advertise_preference_for_instance_address: p("diego.rep.advertise_preference_for_instance_address"), enable_unproxied_port_mappings: p("containers.proxy.enable_unproxied_port_mappings"), proxy_memory_allocation_mb: p("containers.proxy.additional_memory_allocation_mb"), From e3f31d6f72acc6bfcac08215beb10d7df5f5c654 Mon Sep 17 00:00:00 2001 From: Viktor Velkov <91468304+Viktor-Velkov@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:34:08 +0200 Subject: [PATCH 3/3] Update spec --- jobs/rep/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/rep/spec b/jobs/rep/spec index 7b83840822..ef655a3ee9 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -136,7 +136,7 @@ properties: default: false diego.executor.proxy_healthcheck_interval: description: "Interval that checks envoy responsiveness every 30s." - default: 30 + default: "30s" diego.executor.enable_container_proxy_healthcheck: description: "Healthcheck for the envoy container." default: false