Skip to content

Commit 21646e3

Browse files
committed
fix: using hardcoded region values instead of variables
1 parent 6a47f8a commit 21646e3

File tree

2 files changed

+11
-34
lines changed

2 files changed

+11
-34
lines changed

examples/internal-lb-cloud-run/main.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ resource "google_compute_subnetwork" "internal_lb_subnet_a" {
3232
name = "int-lb-subnet-a"
3333
ip_cidr_range = "10.1.2.0/24"
3434
network = google_compute_network.internal_lb_network.id
35-
region = var.subnet_region_a
35+
region = "us-east1"
3636
project = var.project_id
3737
depends_on = [google_compute_network.internal_lb_network]
3838
}
@@ -42,7 +42,7 @@ resource "google_compute_subnetwork" "internal_lb_proxy_only_a" {
4242
ip_cidr_range = "10.129.0.0/23"
4343
network = google_compute_network.internal_lb_network.id
4444
purpose = "GLOBAL_MANAGED_PROXY"
45-
region = var.subnet_region_a
45+
region = "us-east1"
4646
project = var.project_id
4747
role = "ACTIVE"
4848
depends_on = [google_compute_network.internal_lb_network]
@@ -52,7 +52,7 @@ resource "google_compute_subnetwork" "internal_lb_subnet_b" {
5252
name = "int-lb-subnet-b"
5353
ip_cidr_range = "10.1.3.0/24"
5454
network = google_compute_network.internal_lb_network.id
55-
region = var.subnet_region_b
55+
region = "us-south1"
5656
project = var.project_id
5757
depends_on = [google_compute_network.internal_lb_network]
5858
}
@@ -62,7 +62,7 @@ resource "google_compute_subnetwork" "internal_lb_proxy_only_b" {
6262
ip_cidr_range = "10.130.0.0/23"
6363
network = google_compute_network.internal_lb_network.id
6464
purpose = "GLOBAL_MANAGED_PROXY"
65-
region = var.subnet_region_b
65+
region = "us-south1"
6666
project = var.project_id
6767
role = "ACTIVE"
6868
depends_on = [google_compute_network.internal_lb_network]
@@ -72,7 +72,7 @@ module "backend-service-region-a" {
7272
source = "GoogleCloudPlatform/cloud-run/google//modules/v2"
7373
version = "~> 0.16.3"
7474
project_id = var.project_id
75-
location = var.backend_region_a
75+
location = "us-central1"
7676
service_name = "bs-a"
7777
containers = [{ "container_name" = "", "container_image" = "gcr.io/cloudrun/hello" }]
7878
members = ["allUsers"]
@@ -85,7 +85,7 @@ module "backend-service-region-b" {
8585
source = "GoogleCloudPlatform/cloud-run/google//modules/v2"
8686
version = "~> 0.16.3"
8787
project_id = var.project_id
88-
location = var.backend_region_b
88+
location = "us-west1"
8989
service_name = "bs-b"
9090
containers = [{ "container_name" = "", "container_image" = "gcr.io/cloudrun/hello" }]
9191
members = ["allUsers"]
@@ -104,8 +104,8 @@ module "internal-lb-http-backend" {
104104
load_balancing_scheme = "INTERNAL_MANAGED"
105105
locality_lb_policy = "RANDOM"
106106
serverless_neg_backends = [
107-
{ region : var.backend_region_a, type : "cloud-run", service_name : module.backend-service-region-a.service_name },
108-
{ region : var.backend_region_b, type : "cloud-run", service_name : module.backend-service-region-b.service_name }
107+
{ region : "us-central1", type : "cloud-run", service_name : module.backend-service-region-a.service_name },
108+
{ region : "us-west1", type : "cloud-run", service_name : module.backend-service-region-b.service_name }
109109
]
110110
}
111111

@@ -129,7 +129,7 @@ resource "google_vpc_access_connector" "internal_lb_vpc_connector" {
129129
provider = google-beta
130130
project = var.project_id
131131
name = "int-lb-vpc-connector"
132-
region = var.subnet_region_a
132+
region = "us-east1"
133133
ip_cidr_range = "10.8.0.0/28"
134134
network = google_compute_network.internal_lb_network.name
135135
max_throughput = 500
@@ -140,7 +140,7 @@ module "frontend-service-a" {
140140
source = "GoogleCloudPlatform/cloud-run/google//modules/v2"
141141
version = "~> 0.16.3"
142142
project_id = var.project_id
143-
location = var.subnet_region_a
143+
location = "us-east1"
144144
service_name = "fs-a"
145145
containers = [{ "env_vars" : { "TARGET_IP" : module.internal-lb-http-frontend.ip_address_internal_managed_http[0] }, "ports" = { "container_port" = 80, "name" = "http1" }, "container_name" = "", "container_image" = "gcr.io/design-center-container-repo/redirect-traffic:latest-2002" }]
146146
members = ["allUsers"]
@@ -158,7 +158,7 @@ module "frontend-service-b" {
158158
source = "GoogleCloudPlatform/cloud-run/google//modules/v2"
159159
version = "~> 0.16.3"
160160
project_id = var.project_id
161-
location = var.subnet_region_a
161+
location = "us-east1"
162162
service_name = "fs-b"
163163
containers = [{ "env_vars" : { "TARGET_IP" : module.internal-lb-http-frontend.ip_address_internal_managed_http[1] }, "ports" = { "container_port" = 80, "name" = "http1" }, "container_name" = "", "container_image" = "gcr.io/design-center-container-repo/redirect-traffic:latest-2002" }]
164164
members = ["allUsers"]

examples/internal-lb-cloud-run/variables.tf

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,3 @@
1717
variable "project_id" {
1818
type = string
1919
}
20-
21-
variable "backend_region_a" {
22-
type = string
23-
default = "us-east1"
24-
}
25-
26-
variable "backend_region_b" {
27-
type = string
28-
default = "us-south1"
29-
}
30-
31-
variable "subnet_region_a" {
32-
type = string
33-
default = "us-central1"
34-
}
35-
36-
variable "subnet_region_b" {
37-
type = string
38-
default = "us-west1"
39-
}
40-
41-
42-

0 commit comments

Comments
 (0)