From b04792295c555dc3d5d32bf3a75789b3b0c2b7f7 Mon Sep 17 00:00:00 2001
From: renjiez <renjiez@google.com>
Date: Fri, 18 Oct 2024 22:28:25 +0000
Subject: [PATCH] Increase simulator resource

---
 src/main/k8s/dev/BUILD.bazel                       |  1 +
 ...hetic_generator_config_files_kustomization.yaml |  8 ++++----
 .../dev/synthetic_generator_edp_simulator_gke.cue  | 14 +++++++-------
 src/main/k8s/testing/data/BUILD.bazel              |  5 +++++
 .../measurement/integration/common/BUILD.bazel     |  1 +
 src/main/terraform/gcloud/cmms/simulators.tf       |  2 +-
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/k8s/dev/BUILD.bazel b/src/main/k8s/dev/BUILD.bazel
index 80350d26e9c..d671f1ed98d 100644
--- 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
index 606c4df98b8..d507ff2331a 100644
--- 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
index 8a1c2b7276c..b77fb34ea2e 100644
--- 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
index 59304915928..abb7b7b7b8d 100644
--- 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
index cf12dfdf459..a072ef1fd60 100644
--- 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
index 121ee4a5ec0..db3f049cc7b 100644
--- 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
 }