From a33bcecf354f934456b04953578e6e2a32b9da77 Mon Sep 17 00:00:00 2001 From: Chad Woolley Date: Tue, 29 Apr 2025 09:55:33 -0700 Subject: [PATCH] Increase workspace cloner memory limit - Larger repos are getting out of memory errors on workspace startup - Increase from 512Mi to 2048Mi --- .../create/project_cloner_component_inserter.rb | 4 ++-- .../example.processed-devfile.yaml.erb | 4 ++-- .../example.project-cloner-inserted-devfile.yaml.erb | 4 ++-- .../reconcile/output/config_values_extractor_spec.rb | 2 +- .../desired_config_generator_golden_master_spec.rb | 12 ++++++------ .../remote_development_shared_contexts.rb | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ee/lib/remote_development/workspace_operations/create/project_cloner_component_inserter.rb b/ee/lib/remote_development/workspace_operations/create/project_cloner_component_inserter.rb index e27072aee8bb14..25bd000e1cdc4c 100644 --- a/ee/lib/remote_development/workspace_operations/create/project_cloner_component_inserter.rb +++ b/ee/lib/remote_development/workspace_operations/create/project_cloner_component_inserter.rb @@ -61,8 +61,8 @@ def self.insert(context) # command has been overridden here as the default command in the alpine/git # container invokes git directly command: %w[/bin/sh -c], - memoryLimit: "512Mi", - memoryRequest: "256Mi", + memoryLimit: "1000Mi", + memoryRequest: "500Mi", cpuLimit: "500m", cpuRequest: "100m" } diff --git a/ee/spec/fixtures/remote_development/example.processed-devfile.yaml.erb b/ee/spec/fixtures/remote_development/example.processed-devfile.yaml.erb index e83db1db492413..c28ada0fc70447 100644 --- a/ee/spec/fixtures/remote_development/example.processed-devfile.yaml.erb +++ b/ee/spec/fixtures/remote_development/example.processed-devfile.yaml.erb @@ -75,8 +75,8 @@ components: command: - "/bin/sh" - "-c" - memoryLimit: 512Mi - memoryRequest: 256Mi + memoryLimit: 1000Mi + memoryRequest: 500Mi cpuLimit: 500m cpuRequest: 100m - name: gl-workspace-data diff --git a/ee/spec/fixtures/remote_development/example.project-cloner-inserted-devfile.yaml.erb b/ee/spec/fixtures/remote_development/example.project-cloner-inserted-devfile.yaml.erb index 3c9e98e6f15647..2e962faa476372 100644 --- a/ee/spec/fixtures/remote_development/example.project-cloner-inserted-devfile.yaml.erb +++ b/ee/spec/fixtures/remote_development/example.project-cloner-inserted-devfile.yaml.erb @@ -63,8 +63,8 @@ components: command: - "/bin/sh" - "-c" - memoryLimit: 512Mi - memoryRequest: 256Mi + memoryLimit: 1000Mi + memoryRequest: 500Mi cpuLimit: 500m cpuRequest: 100m events: diff --git a/ee/spec/lib/remote_development/workspace_operations/reconcile/output/config_values_extractor_spec.rb b/ee/spec/lib/remote_development/workspace_operations/reconcile/output/config_values_extractor_spec.rb index 15ff5f22b19fff..3a23062b7bf48c 100644 --- a/ee/spec/lib/remote_development/workspace_operations/reconcile/output/config_values_extractor_spec.rb +++ b/ee/spec/lib/remote_development/workspace_operations/reconcile/output/config_values_extractor_spec.rb @@ -44,7 +44,7 @@ let_it_be(:default_resources_per_workspace_container) do { requests: { - memory: "500Mi", + memory: "600Mi", cpu: "0.5" }, limits: { diff --git a/ee/spec/lib/remote_development/workspace_operations/reconcile/output/desired_config_generator_golden_master_spec.rb b/ee/spec/lib/remote_development/workspace_operations/reconcile/output/desired_config_generator_golden_master_spec.rb index 718a0a7e482b15..ab1f1d28e861c3 100644 --- a/ee/spec/lib/remote_development/workspace_operations/reconcile/output/desired_config_generator_golden_master_spec.rb +++ b/ee/spec/lib/remote_development/workspace_operations/reconcile/output/desired_config_generator_golden_master_spec.rb @@ -193,8 +193,8 @@ def input_processed_devfile_yaml command: - "/bin/sh" - "-c" - memoryLimit: 512Mi - memoryRequest: 256Mi + memoryLimit: 1000Mi + memoryRequest: 500Mi cpuLimit: 500m cpuRequest: 100m - name: gl-workspace-data @@ -445,11 +445,11 @@ def golden_master_desired_config_with_include_all_resources_true resources: { limits: { cpu: "500m", - memory: "512Mi" + memory: "1000Mi" }, requests: { cpu: "100m", - memory: "256Mi" + memory: "500Mi" } }, securityContext: { @@ -966,11 +966,11 @@ def golden_master_desired_config_with_include_all_resources_false resources: { limits: { cpu: "500m", - memory: "512Mi" + memory: "1000Mi" }, requests: { cpu: "100m", - memory: "256Mi" + memory: "500Mi" } }, securityContext: { diff --git a/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb b/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb index c6ceec39666ae9..585a46cf4dcff7 100644 --- a/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb +++ b/ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb @@ -744,11 +744,11 @@ def workspace_deployment( resources: { limits: { cpu: "500m", - memory: "512Mi" + memory: "1000Mi" }, requests: { cpu: "100m", - memory: "256Mi" + memory: "500Mi" } }, volumeMounts: [ -- GitLab