Skip to content

Commit f7a8b04

Browse files
committed
use min_instances=2 for both google_vpc_access_connector, rmv beta
1 parent ac7566d commit f7a8b04

File tree

2 files changed

+21
-37
lines changed

2 files changed

+21
-37
lines changed

run/static_outbound/main.tf

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
provider "google-beta" {
18-
region = "us-central1"
19-
}
20-
2117
# Enable Compute Engine API
2218
# [START cloudrun_static_outbound_parent_tag]
2319
resource "google_project_service" "compute_engine_api" {
@@ -34,14 +30,12 @@ resource "google_project_service" "cloudrun_api" {
3430
# Example of setting up a Cloud Run service with a static outbound IP
3531
# [START cloudrun_service_static_network]
3632
resource "google_compute_network" "default" {
37-
provider = google-beta
38-
name = "cr-static-ip-network"
33+
name = "cr-static-ip-network"
3934
}
4035
# [END cloudrun_service_static_network]
4136

4237
# [START cloudrun_service_static_subnet]
4338
resource "google_compute_subnetwork" "default" {
44-
provider = google-beta
4539
name = "cr-static-ip"
4640
ip_cidr_range = "10.124.0.0/28"
4741
network = google_compute_network.default.id
@@ -51,15 +45,14 @@ resource "google_compute_subnetwork" "default" {
5145

5246
# [START cloudrun_service_static_vpc_conn]
5347
resource "google_project_service" "vpc" {
54-
provider = google-beta
5548
service = "vpcaccess.googleapis.com"
5649
disable_on_destroy = false
5750
}
5851

5952
resource "google_vpc_access_connector" "default" {
60-
provider = google-beta
61-
name = "cr-conn"
62-
region = "us-central1"
53+
name = "cr-conn"
54+
region = "us-central1"
55+
min_instances = 2
6356

6457
subnet {
6558
name = google_compute_subnetwork.default.name
@@ -75,27 +68,24 @@ resource "google_vpc_access_connector" "default" {
7568

7669
# [START cloudrun_service_static_router]
7770
resource "google_compute_router" "default" {
78-
provider = google-beta
79-
name = "cr-static-ip-router"
80-
network = google_compute_network.default.name
81-
region = google_compute_subnetwork.default.region
71+
name = "cr-static-ip-router"
72+
network = google_compute_network.default.name
73+
region = google_compute_subnetwork.default.region
8274
}
8375
# [END cloudrun_service_static_router]
8476

8577
# [START cloudrun_service_static_addr]
8678
resource "google_compute_address" "default" {
87-
provider = google-beta
88-
name = "cr-static-ip-addr"
89-
region = google_compute_subnetwork.default.region
79+
name = "cr-static-ip-addr"
80+
region = google_compute_subnetwork.default.region
9081
}
9182
# [END cloudrun_service_static_addr]
9283

9384
# [START cloudrun_service_static_nat]
9485
resource "google_compute_router_nat" "default" {
95-
provider = google-beta
96-
name = "cr-static-nat"
97-
router = google_compute_router.default.name
98-
region = google_compute_subnetwork.default.region
86+
name = "cr-static-nat"
87+
router = google_compute_router.default.name
88+
region = google_compute_subnetwork.default.region
9989

10090
nat_ip_allocate_option = "MANUAL_ONLY"
10191
nat_ips = [google_compute_address.default.self_link]
@@ -110,7 +100,6 @@ resource "google_compute_router_nat" "default" {
110100

111101
# [START cloudrun_service_static_service]
112102
resource "google_cloud_run_v2_service" "default" {
113-
provider = google-beta
114103
name = "cr-static-ip-service"
115104
location = google_compute_subnetwork.default.region
116105

run/vpc_access_connector/main.tf

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
# [START vpc_serverless_connector_enable_api]
1919
resource "google_project_service" "vpcaccess_api" {
2020
service = "vpcaccess.googleapis.com"
21-
provider = google-beta
2221
disable_on_destroy = false
2322
}
2423
# [END vpc_serverless_connector_enable_api]
@@ -27,32 +26,29 @@ resource "google_project_service" "vpcaccess_api" {
2726
# VPC
2827
resource "google_compute_network" "default" {
2928
name = "cloudrun-network"
30-
provider = google-beta
3129
auto_create_subnetworks = false
3230
}
3331

3432
# VPC access connector
3533
resource "google_vpc_access_connector" "connector" {
36-
name = "vpcconn"
37-
provider = google-beta
38-
region = "us-west1"
39-
ip_cidr_range = "10.8.0.0/28"
40-
network = google_compute_network.default.name
41-
depends_on = [google_project_service.vpcaccess_api]
34+
name = "vpcconn"
35+
region = "us-west1"
36+
ip_cidr_range = "10.8.0.0/28"
37+
network = google_compute_network.default.name
38+
depends_on = [google_project_service.vpcaccess_api]
39+
min_instances = 2
4240
}
4341

4442
# Cloud Router
4543
resource "google_compute_router" "router" {
46-
name = "router"
47-
provider = google-beta
48-
region = "us-west1"
49-
network = google_compute_network.default.id
44+
name = "router"
45+
region = "us-west1"
46+
network = google_compute_network.default.id
5047
}
5148

5249
# NAT configuration
5350
resource "google_compute_router_nat" "router_nat" {
5451
name = "nat"
55-
provider = google-beta
5652
region = "us-west1"
5753
router = google_compute_router.router.name
5854
source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
@@ -64,7 +60,6 @@ resource "google_compute_router_nat" "router_nat" {
6460
# Cloud Run service
6561
resource "google_cloud_run_v2_service" "gcr_service" {
6662
name = "mygcrservice"
67-
provider = google-beta
6863
location = "us-west1"
6964

7065
template {

0 commit comments

Comments
 (0)