From 8420fd66ded5e3a44b052d212f8eac3109aec14a Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 29 Dec 2023 12:16:24 +0800 Subject: [PATCH] set network name -> dev --- iac_modules/terraform/gcp/firewall/config.yaml | 2 +- iac_modules/terraform/gcp/network/main.tf | 6 ++---- iac_modules/terraform/gcp/vhost/config.yaml | 10 +++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/iac_modules/terraform/gcp/firewall/config.yaml b/iac_modules/terraform/gcp/firewall/config.yaml index e76d3c8e..aea90329 100644 --- a/iac_modules/terraform/gcp/firewall/config.yaml +++ b/iac_modules/terraform/gcp/firewall/config.yaml @@ -3,7 +3,7 @@ project_id: "cloudsvcsandbox" bucket_name: "iac_gcp_terraform_state" firewall_rules: - name: allow-ingress - network: "custom" + network: "dev" allow: - protocol: tcp ports: [ "22", "8022", "80", "443" ] diff --git a/iac_modules/terraform/gcp/network/main.tf b/iac_modules/terraform/gcp/network/main.tf index 16831413..73c1ccc9 100644 --- a/iac_modules/terraform/gcp/network/main.tf +++ b/iac_modules/terraform/gcp/network/main.tf @@ -1,10 +1,10 @@ # Create a VPC network resource "google_compute_network" "default" { - name = "custom" + name = "dev-vpc" project = local.config.project_id auto_create_subnetworks = false delete_default_routes_on_create = true - description = "My custom network" + description = "My custom network for Dev" } # 子网1:路由到互联网网关出口的子网 @@ -27,5 +27,3 @@ resource "google_compute_subnetwork" "private_subnet" { ip_cidr_range = "10.0.3.0/24" # 请根据实际需要调整 IP 范围 network = google_compute_network.default.id } - - diff --git a/iac_modules/terraform/gcp/vhost/config.yaml b/iac_modules/terraform/gcp/vhost/config.yaml index 9f4936a9..3972458d 100644 --- a/iac_modules/terraform/gcp/vhost/config.yaml +++ b/iac_modules/terraform/gcp/vhost/config.yaml @@ -7,33 +7,33 @@ instances: zone: "asia-northeast1-a" image: "ubuntu-2004-lts" disk_size_gb: 100 - network: "custom" + network: "dev" subnetwork: internet-subnet - name: "monitor" type: "e2-standard-4" zone: "asia-northeast1-a" image: "ubuntu-2004-lts" disk_size_gb: 100 - network: "custom" + network: "dev" subnetwork: internet-subnet - name: "sit" image: "ubuntu-2004-lts" disk_size_gb: 100 type: "e2-standard-2" zone: "asia-northeast1-a" - network: "custom" + network: "dev" subnetwork: internet-subnet - name: "uat" type: "e2-standard-4" zone: "asia-northeast1-a" image: "ubuntu-2004-lts" disk_size_gb: 100 - network: "custom" + network: "dev" subnetwork: internet-subnet - name: "prod" type: "e2-standard-4" zone: "asia-northeast1-a" image: "ubuntu-2004-lts" disk_size_gb: 100 - network: "custom" + network: "dev" subnetwork: internet-subnet