Merge branch 'main' into staging

images/db/config/postgresql.production.conf

@@ -62,7 +62,7 @@ listen_addresses = '*'
 					# defaults to 'localhost'; use '*' for all
 					# (change requires restart)
 #port = 5432				# (change requires restart)
-max_connections = 250			# (change requires restart)
+max_connections = 200			# (change requires restart)
 #superuser_reserved_connections = 3	# (change requires restart)
 #unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
 					# (change requires restart)
@@ -124,7 +124,7 @@ max_connections = 250			# (change requires restart)
 
 # - Memory -
 
-shared_buffers = 2GB			# min 128kB
+shared_buffers = 8GB			# min 128kB
 					# (change requires restart)
 #huge_pages = try			# on, off, or try
 					# (change requires restart)
@@ -135,9 +135,9 @@ temp_buffers = 512MB			# min 800kB
 					# (change requires restart)
 # Caution: it is not advisable to set max_prepared_transactions nonzero unless
 # you actively intend to use prepared transactions.
-work_mem = 20MB				# min 64kB
+work_mem = 64MB				# min 64kB
 #hash_mem_multiplier = 1.0		# 1-1000.0 multiplier on hash table work_mem
-maintenance_work_mem = 512MB		# min 1MB
+maintenance_work_mem = 2GB		# min 1MB
 #autovacuum_work_mem = -1		# min 1MB, or -1 to use maintenance_work_mem
 #logical_decoding_work_mem = 64MB	# min 64kB
 #max_stack_depth = 2MB			# min 100kB
@@ -237,8 +237,8 @@ effective_io_concurrency = 200		# 1-1000; 0 disables prefetching
 #checkpoint_completion_target = 0.9	# checkpoint target duration, 0.0 - 1.0
 #checkpoint_flush_after = 256kB		# measured in pages, 0 disables
 #checkpoint_warning = 30s		# 0 disables
-max_wal_size = 1GB
-min_wal_size = 80MB
+max_wal_size = 2GB
+min_wal_size = 1GB
 
 # - Archiving -
 
@@ -383,14 +383,14 @@ min_wal_size = 80MB
 
 #seq_page_cost = 1.0			# measured on an arbitrary scale
 random_page_cost = 1.1			# same scale as above
-#cpu_tuple_cost = 0.01			# same scale as above
-#cpu_index_tuple_cost = 0.005		# same scale as above
-#cpu_operator_cost = 0.0025		# same scale as above
+# cpu_tuple_cost = 0.01			# same scale as above
+# cpu_index_tuple_cost = 0.005		# same scale as above
+# cpu_operator_cost = 0.0025		# same scale as above
 #parallel_setup_cost = 1000.0	# same scale as above
 #parallel_tuple_cost = 0.1		# same scale as above
 #min_parallel_table_scan_size = 8MB
 #min_parallel_index_scan_size = 512kB
-effective_cache_size = 6GB
+effective_cache_size = 24GB
 
 #jit_above_cost = 100000		# perform JIT compilation if available
 					# and query more expensive than this;
@@ -795,4 +795,4 @@ default_text_search_config = 'pg_catalog.english'
 # CUSTOMIZED OPTIONS
 #------------------------------------------------------------------------------
 
-# Add settings for extensions here
+# Add settings for extensions here

values.production.template.yaml

@@ -58,7 +58,7 @@ osm-seed:
     nodeSelector:
       enabled: true
       label_key: nodegroup_type
-      label_value: db
+      label_value: api_db
     env:
       POSTGRES_DB: {{PRODUCTION_DB}}
       POSTGRES_USER: {{PRODUCTION_DB_USER}}
@@ -75,12 +75,12 @@ osm-seed:
     resources:
       enabled: false
       requests:
-        memory: "10Gi"
-        cpu: "5"
+        memory: "30Gi"
+        cpu: "8"
       limits:
-        memory: "10Gi"
-        cpu: "5"
-    sharedMemorySize: 512Mi
+        memory: "32Gi"
+        cpu: "8"
+    sharedMemorySize: 2Gi
 
   # ====================================================================================================
   # Variables for osm-seed website
@@ -343,7 +343,7 @@ osm-seed:
     nodeSelector:
       enabled: true
       label_key: nodegroup_type
-      label_value: db
+      label_value: tiler_db
     env:
       POSTGRES_HOST: production-tiler-db
       POSTGRES_DB: tiler-osm
@@ -365,7 +365,7 @@ osm-seed:
       AWS_ElasticBlockStore_volumeID: vol-038f080b3d129c907
       AWS_ElasticBlockStore_size: 400Gi
     resources:
-      enabled: true
+      enabled: false
       requests:
         memory: "20Gi"
         cpu: "4"