From 05cc03314355e629a3e676fd37f6da7e2efeb068 Mon Sep 17 00:00:00 2001 From: mrludohenny Date: Wed, 5 Mar 2025 14:09:11 +0100 Subject: [PATCH 1/3] Update project IDs and buckets --- environments/dev/backend.tf | 2 +- environments/dev/terraform.tfvars | 2 +- environments/prod/backend.tf | 2 +- environments/prod/terraform.tfvars | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 33a807a336..19b37eaff8 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "tf-cloudbuild-gitops-tfstate" prefix = "env/dev" } } diff --git a/environments/dev/terraform.tfvars b/environments/dev/terraform.tfvars index cb8a5a1bbc..10c5a9b1d9 100644 --- a/environments/dev/terraform.tfvars +++ b/environments/dev/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="tf-cloudbuild-gitops" \ No newline at end of file diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7ed343b1a2..e3ea1e6c16 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "tf-cloudbuild-gitops-tfstate" prefix = "env/prod" } } diff --git a/environments/prod/terraform.tfvars b/environments/prod/terraform.tfvars index cb8a5a1bbc..10c5a9b1d9 100644 --- a/environments/prod/terraform.tfvars +++ b/environments/prod/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="tf-cloudbuild-gitops" \ No newline at end of file From 7f507ea38e365483a268fc113d436693870a0005 Mon Sep 17 00:00:00 2001 From: mrludohenny Date: Wed, 5 Mar 2025 14:36:01 +0100 Subject: [PATCH 2/3] Fixing http firewall target --- modules/firewall/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/firewall/main.tf b/modules/firewall/main.tf index 5e40f7089f..1d2e549134 100644 --- a/modules/firewall/main.tf +++ b/modules/firewall/main.tf @@ -27,6 +27,6 @@ resource "google_compute_firewall" "allow-http" { ports = ["80"] } - target_tags = ["http-server2"] + target_tags = ["http-server"] source_ranges = ["0.0.0.0/0"] } From 35413c9c1a5ea3e71ced55252953a8d5a94790ad Mon Sep 17 00:00:00 2001 From: mrludohenny Date: Wed, 5 Mar 2025 14:57:57 +0100 Subject: [PATCH 3/3] changed default location of gcs bucket to eu --- environments/dev/backend.tf | 1 + environments/prod/backend.tf | 1 + 2 files changed, 2 insertions(+) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 19b37eaff8..cfb97c3f7f 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -17,5 +17,6 @@ terraform { backend "gcs" { bucket = "tf-cloudbuild-gitops-tfstate" prefix = "env/dev" + location = "EU" } } diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index e3ea1e6c16..f2d487da0a 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -17,5 +17,6 @@ terraform { backend "gcs" { bucket = "tf-cloudbuild-gitops-tfstate" prefix = "env/prod" + location = "EU" } }