Merge branch 'main' into feature-AAA

# Conflicts: # stack/stack_config/Pulumi.production.yaml
SkyTruth · Oct 5, 2023 · 7cc28f0 · 7cc28f0
2 parents 5beedb2 + 786916f
commit 7cc28f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/stack/cloud_run_tipg.py b/stack/cloud_run_tipg.py
@@ -72,8 +72,12 @@
                             name="TIPG_TABLE_CONFIG__public_slick_plus__DATETIMECOL",
                             value="slick_timestamp",
                         ),
+                        gcp.cloudrun.ServiceTemplateSpecContainerEnvArgs(
+                            name="TIPG_MAX_FEATURES_PER_QUERY",
+                            value=50000,
+                        ),
                     ],
-                    resources=dict(limits=dict(memory="2Gi", cpu="4000m")),
+                    resources=dict(limits=dict(memory="8Gi", cpu="6000m")),
                 ),
             ],
             timeout_seconds=420,

diff --git a/stack/stack_config/Pulumi.production.yaml b/stack/stack_config/Pulumi.production.yaml
@@ -6,7 +6,7 @@ config:
   cerulean-cloud:dryrun_historical: "" # Make empty "" to turn on historical runs
   cerulean-cloud:dryrun_relevancy: "" # Make empty "" to turn on recurring runs
   cerulean-cloud:dryrun_ais: "" # Make empty "" to turn on AIS analysis
-  db:db-instance: db-g1-small
+  db:db-instance: db-custom-4-15360
   db:deletion-protection: "True"
   db:db-password:
     secure: v1:PKkW6hR207H6+aLE:QRMTEAQMB5VFmJt4Sbvzx7i4hkqlO4HomLltlRFYrQ==

diff --git a/stack/stack_config/Pulumi.staging.yaml b/stack/stack_config/Pulumi.staging.yaml
@@ -6,7 +6,7 @@ config:
   cerulean-cloud:dryrun_ais: "" # Make empty "" to turn on AIS analysis
   cerulean-cloud:apikey:
     secure: v1:GEqP+nWvrQb16t/f:uhLbrS+C7yFjQunkOnBOw9eZXt8JUS5dsiDTSH5hytK5vJ3zO8DJO5bOjQNBOKn/T5AWGA==
-  db:db-instance: db-f1-micro
+  db:db-instance: db-custom-4-15360
   db:deletion-protection: "True"
   db:db-password:
     secure: v1:Ea/zFeRAgMYN80Zj:TTw3Y7ETepsDhd1tpK6z6fzab54PT1g1udNHmchgIT7/IcjiMgTb