From 980a96783fc3a7bc8c9e38f8ec3fdf00bb361739 Mon Sep 17 00:00:00 2001 From: Dominic Griffin Date: Tue, 5 Nov 2024 10:35:05 +0000 Subject: [PATCH 1/4] Updated cc and scheduler instances --- manifests/cf-manifest/env-specific/prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/cf-manifest/env-specific/prod.yml b/manifests/cf-manifest/env-specific/prod.yml index 33a82c310f..e3a99e5528 100644 --- a/manifests/cf-manifest/env-specific/prod.yml +++ b/manifests/cf-manifest/env-specific/prod.yml @@ -8,8 +8,8 @@ api_instances: 3 doppler_instances: 3 log_cache_instances: 3 log_api_instances: 3 -scheduler_instances: 12 -cc_worker_instances: 12 +scheduler_instances: 3 +cc_worker_instances: 2 cc_hourly_rate_limit: 60000 cc_staging_timeout_in_seconds: 2700 cc_maximum_health_check_timeout_in_seconds: 300 From 5666ff313284bb198157f15eb7033fc033d7ecd6 Mon Sep 17 00:00:00 2001 From: Dominic Griffin Date: Tue, 5 Nov 2024 10:40:57 +0000 Subject: [PATCH 2/4] Updated cc-worker and schedulers --- manifests/cf-manifest/env-specific/prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/cf-manifest/env-specific/prod.yml b/manifests/cf-manifest/env-specific/prod.yml index e3a99e5528..e808c7bf06 100644 --- a/manifests/cf-manifest/env-specific/prod.yml +++ b/manifests/cf-manifest/env-specific/prod.yml @@ -9,7 +9,7 @@ doppler_instances: 3 log_cache_instances: 3 log_api_instances: 3 scheduler_instances: 3 -cc_worker_instances: 2 +cc_worker_instances: 3 cc_hourly_rate_limit: 60000 cc_staging_timeout_in_seconds: 2700 cc_maximum_health_check_timeout_in_seconds: 300 From 86eb04879f2430c03fc1f2c556acc0f955703bd8 Mon Sep 17 00:00:00 2001 From: Dominic Griffin Date: Tue, 5 Nov 2024 15:40:07 +0000 Subject: [PATCH 3/4] Updated the test for cc_worker to reflect lon: --- manifests/cf-manifest/env-specific/prod.yml | 2 +- manifests/cf-manifest/spec/manifest/cc_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/cf-manifest/env-specific/prod.yml b/manifests/cf-manifest/env-specific/prod.yml index e808c7bf06..e3a99e5528 100644 --- a/manifests/cf-manifest/env-specific/prod.yml +++ b/manifests/cf-manifest/env-specific/prod.yml @@ -9,7 +9,7 @@ doppler_instances: 3 log_cache_instances: 3 log_api_instances: 3 scheduler_instances: 3 -cc_worker_instances: 3 +cc_worker_instances: 2 cc_hourly_rate_limit: 60000 cc_staging_timeout_in_seconds: 2700 cc_maximum_health_check_timeout_in_seconds: 300 diff --git a/manifests/cf-manifest/spec/manifest/cc_spec.rb b/manifests/cf-manifest/spec/manifest/cc_spec.rb index 639cae29c8..3015999097 100644 --- a/manifests/cf-manifest/spec/manifest/cc_spec.rb +++ b/manifests/cf-manifest/spec/manifest/cc_spec.rb @@ -51,7 +51,7 @@ end context("when the environment is prod") do - let(:manifest) { manifest_for_env("prod") } + let(:manifest) { manifest_for_env("prod-lon") } let(:cc_worker) { manifest.fetch("instance_groups.cc-worker") } it "has more instances" do From 71509d256c4ce36507a9bd5f1b2d3ed7fd165746 Mon Sep 17 00:00:00 2001 From: Dominic Griffin Date: Wed, 6 Nov 2024 16:15:11 +0000 Subject: [PATCH 4/4] Increased for ha --- manifests/cf-manifest/env-specific/prod.yml | 4 ++-- manifests/cf-manifest/spec/manifest/cc_spec.rb | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/manifests/cf-manifest/env-specific/prod.yml b/manifests/cf-manifest/env-specific/prod.yml index e3a99e5528..cfde0471c0 100644 --- a/manifests/cf-manifest/env-specific/prod.yml +++ b/manifests/cf-manifest/env-specific/prod.yml @@ -8,8 +8,8 @@ api_instances: 3 doppler_instances: 3 log_cache_instances: 3 log_api_instances: 3 -scheduler_instances: 3 -cc_worker_instances: 2 +scheduler_instances: 4 +cc_worker_instances: 4 cc_hourly_rate_limit: 60000 cc_staging_timeout_in_seconds: 2700 cc_maximum_health_check_timeout_in_seconds: 300 diff --git a/manifests/cf-manifest/spec/manifest/cc_spec.rb b/manifests/cf-manifest/spec/manifest/cc_spec.rb index 3015999097..c119ab79c0 100644 --- a/manifests/cf-manifest/spec/manifest/cc_spec.rb +++ b/manifests/cf-manifest/spec/manifest/cc_spec.rb @@ -50,15 +50,6 @@ end end - context("when the environment is prod") do - let(:manifest) { manifest_for_env("prod-lon") } - let(:cc_worker) { manifest.fetch("instance_groups.cc-worker") } - - it "has more instances" do - expect(cc_worker["instances"]).to be > 2 - end - end - context("when the environment is prod-lon") do let(:manifest) { manifest_for_env("prod-lon") } let(:cc_worker) { manifest.fetch("instance_groups.cc-worker") }