Merge pull request #427 from cloudfoundry/recreate_wg_ci_test

Move wg-ci-test to us-east1 and update Postgres version to 16

Author: jochenehret

terraform-modules/concourse/infra/database.tf

@@ -1,5 +1,5 @@
 resource "google_sql_database_instance" "concourse" {
-  database_version = "POSTGRES_13"
+  database_version = var.database_version
   name             = var.sql_instance_name
   project          = var.project
   region           = var.region
@@ -33,6 +33,8 @@ resource "google_sql_database_instance" "concourse" {
     disk_size             = var.sql_instance_disk_size
     disk_type             = "PD_SSD"
 
+    edition = "ENTERPRISE"
+
     ip_configuration {
       ipv4_enabled = "true"
     }

terraform-modules/concourse/infra/variables.tf

@@ -16,7 +16,10 @@ variable "zone" {
   nullable    = false
 }
 
-
+variable "database_version" {
+  nullable = false
+  default  = "POSTGRES_13"
+}
 variable "sql_instance_name" { nullable = false }
 variable "sql_instance_secondary_zone" { nullable = false }
 variable "sql_instance_backup_location" { nullable = false }

terragrunt/concourse-wg-ci-test/config.yaml

@@ -1,7 +1,7 @@
 project: app-runtime-interfaces-wg
-region: europe-west3
-zone: europe-west3-a
-secondary_zone: europe-west3-b
+region: us-east1
+zone: us-east1-b
+secondary_zone: us-east1-c
 
 # gcs_prefix builds root folder for tf state for the entire stack
 gcs_bucket: terraform-wg-ci-test
@@ -27,7 +27,6 @@ concourse_container_placement_strategy: "volume-locality"
 # Concourse helm chart
 concourse_helm_version: "18.1.1"
 
-
 # Module sources for the stack - git or local
 # ie.
 #  infra: "[email protected]:cloudfoundry/app-runtime-interfaces-infrastructure.git//terraform-modules/concourse/infra?ref=1.0.0"
@@ -60,12 +59,13 @@ fly_target: ari-test
 # In most cases settings below are safe to keep as defaults
 # ---------------------------------------------------------
 # SQL
+database_version: "POSTGRES_16"
 sql_instance_tier: db-custom-1-4096
 sql_instance_backup_location: eu
 sql_instance_disk_size: 38
 
 # Other GKE vars
-gke_controlplane_version: 1.23.8-gke.1900
+gke_controlplane_version: 1.31
 gke_cluster_ipv4_cidr: 10.104.0.0/14
 gke_services_ipv4_cidr_block: 10.108.0.0/20
 gke_master_ipv4_cidr_block: 172.16.0.32/28

terragrunt/concourse-wg-ci-test/infra/terragrunt.hcl

@@ -50,6 +50,7 @@ inputs = {
 
   gke_http_load_balancing_disabled = local.config.gke_http_load_balancing_disabled
 
+  database_version = local.config.database_version
   sql_instance_name = "${local.config.gke_name}-concourse"
   sql_instance_tier = local.config.sql_instance_tier
   sql_instance_disk_size = local.config.sql_instance_disk_size