Increase simulator resource

world-federation-of-advertisers · Oct 18, 2024 · b047922 · b047922
1 parent 9191039
commit b047922
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/src/main/k8s/dev/BUILD.bazel b/src/main/k8s/dev/BUILD.bazel
@@ -422,6 +422,7 @@ kustomization_dir(
     srcs = [
         "synthetic_generator_config_files_kustomization.yaml",
         "//src/main/k8s/testing/data:synthetic_generation_specs_large",
+        "//src/main/k8s/testing/data:synthetic_generation_specs_us",
     ],
     renames = {
         "synthetic_generator_config_files_kustomization.yaml": "kustomization.yaml",

diff --git a/src/main/k8s/dev/synthetic_generator_config_files_kustomization.yaml b/src/main/k8s/dev/synthetic_generator_config_files_kustomization.yaml
@@ -15,7 +15,7 @@
 configMapGenerator:
 - name: config-files
   files:
-  - synthetic_population_spec_large.textproto
-  - synthetic_event_group_spec_large_1.textproto
-  - synthetic_event_group_spec_large_2.textproto
-  - synthetic_event_group_spec_large_3.textproto
+  - synthetic_population_spec_us.textproto
+  - synthetic_event_group_spec_us_1.textproto
+  - synthetic_event_group_spec_us_2.textproto
+  - synthetic_event_group_spec_us_3.textproto
diff --git a/src/main/k8s/dev/synthetic_generator_edp_simulator_gke.cue b/src/main/k8s/dev/synthetic_generator_edp_simulator_gke.cue
@@ -16,20 +16,20 @@ package k8s
 
 _resourceRequirements: ResourceRequirements=#ResourceRequirements & {
 	requests: {
-		cpu:    "500m"
-		memory: "16Gi"
+		cpu:    "2000m"
+		memory: "50Gi"
 	}
 	limits: {
 		memory: ResourceRequirements.requests.memory
 	}
 }
-_maxHeapSize: "13G"
+_maxHeapSize: "40G"
 
-_populationSpec: "/etc/\(#AppName)/config-files/synthetic_population_spec_large.textproto"
+_populationSpec: "/etc/\(#AppName)/config-files/synthetic_population_spec_us.textproto"
 _eventGroupSpecs: [
-	"/etc/\(#AppName)/config-files/synthetic_event_group_spec_large_1.textproto",
-	"/etc/\(#AppName)/config-files/synthetic_event_group_spec_large_2.textproto",
-	"/etc/\(#AppName)/config-files/synthetic_event_group_spec_large_3.textproto",
+	"/etc/\(#AppName)/config-files/synthetic_event_group_spec_us_1.textproto",
+	"/etc/\(#AppName)/config-files/synthetic_event_group_spec_us_2.textproto",
+	"/etc/\(#AppName)/config-files/synthetic_event_group_spec_us_3.textproto",
 ]
 
 edp_simulators: {

diff --git a/src/main/k8s/testing/data/BUILD.bazel b/src/main/k8s/testing/data/BUILD.bazel
@@ -13,6 +13,11 @@ filegroup(
     srcs = ["synthetic_population_spec_large.textproto"] + glob(["synthetic_event_group_spec_large*.textproto"]),
 )
 
+filegroup(
+    name = "synthetic_generation_specs_us",
+    srcs = ["synthetic_population_spec_us.textproto"] + glob(["synthetic_event_group_spec_us*.textproto"]),
+)
+
 filegroup(
     name = "service_config",
     srcs = ["default_service_config.textproto"],

diff --git a/src/main/kotlin/org/wfanet/measurement/integration/common/BUILD.bazel b/src/main/kotlin/org/wfanet/measurement/integration/common/BUILD.bazel
@@ -119,6 +119,7 @@ kt_jvm_library(
     data = [
         "//src/main/k8s/testing/data:synthetic_generation_specs_large",
         "//src/main/k8s/testing/data:synthetic_generation_specs_small",
+        "//src/main/k8s/testing/data:synthetic_generation_specs_us",
     ],
     visibility = [
         "//src/main/kotlin/org/wfanet/measurement/integration/common/reporting/v2:__subpackages__",

diff --git a/src/main/terraform/gcloud/cmms/simulators.tf b/src/main/terraform/gcloud/cmms/simulators.tf
@@ -37,7 +37,7 @@ module "simulators_spot_node_pool" {
   name            = "spot"
   cluster         = module.simulators_cluster.cluster
   service_account = module.common.cluster_service_account
-  machine_type    = "n2d-highmem-8"
+  machine_type    = "n2d-highmem-16"
   max_node_count  = 6
   spot            = true
 }