Merge branch 'master' into net-lb-proxy-int
This commit is contained in:
commit
75bd7d7c2d
|
@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
### BLUEPRINTS
|
### BLUEPRINTS
|
||||||
|
|
||||||
|
- [[#1548](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1548)] Minor fixes in Vertex Ai MLOPs blueprint ([javiergp](https://github.com/javiergp)) <!-- 2023-07-31 10:52:37+00:00 -->
|
||||||
- [[#1547](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1547)] **incompatible change:** Peering module refactor ([ludoo](https://github.com/ludoo)) <!-- 2023-07-29 19:33:58+00:00 -->
|
- [[#1547](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1547)] **incompatible change:** Peering module refactor ([ludoo](https://github.com/ludoo)) <!-- 2023-07-29 19:33:58+00:00 -->
|
||||||
- [[#1542](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1542)] Grant IAM rights to service identities in host project ([wiktorn](https://github.com/wiktorn)) <!-- 2023-07-29 18:07:21+00:00 -->
|
- [[#1542](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1542)] Grant IAM rights to service identities in host project ([wiktorn](https://github.com/wiktorn)) <!-- 2023-07-29 18:07:21+00:00 -->
|
||||||
- [[#1536](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1536)] **incompatible change:** Update and refactor artifact registry module ([ludoo](https://github.com/ludoo)) <!-- 2023-07-28 09:54:37+00:00 -->
|
- [[#1536](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1536)] **incompatible change:** Update and refactor artifact registry module ([ludoo](https://github.com/ludoo)) <!-- 2023-07-28 09:54:37+00:00 -->
|
||||||
|
@ -31,6 +32,9 @@ All notable changes to this project will be documented in this file.
|
||||||
|
|
||||||
### MODULES
|
### MODULES
|
||||||
|
|
||||||
|
- [[#1554](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1554)] Fix in IAM bindings of cloud function v2 module ([apichick](https://github.com/apichick)) <!-- 2023-07-31 11:22:07+00:00 -->
|
||||||
|
- [[#1551](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1551)] Fix in validation of healthchecks variable ([apichick](https://github.com/apichick)) <!-- 2023-07-31 10:13:19+00:00 -->
|
||||||
|
- [[#1552](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1552)] Add image path output to ar module ([ludoo](https://github.com/ludoo)) <!-- 2023-07-31 09:34:02+00:00 -->
|
||||||
- [[#1550](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1550)] Fix in validation of healthchecks variable ([apichick](https://github.com/apichick)) <!-- 2023-07-31 08:16:52+00:00 -->
|
- [[#1550](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1550)] Fix in validation of healthchecks variable ([apichick](https://github.com/apichick)) <!-- 2023-07-31 08:16:52+00:00 -->
|
||||||
- [[#1547](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1547)] **incompatible change:** Peering module refactor ([ludoo](https://github.com/ludoo)) <!-- 2023-07-29 19:33:58+00:00 -->
|
- [[#1547](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1547)] **incompatible change:** Peering module refactor ([ludoo](https://github.com/ludoo)) <!-- 2023-07-29 19:33:58+00:00 -->
|
||||||
- [[#1542](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1542)] Grant IAM rights to service identities in host project ([wiktorn](https://github.com/wiktorn)) <!-- 2023-07-29 18:07:21+00:00 -->
|
- [[#1542](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/1542)] Grant IAM rights to service identities in host project ([wiktorn](https://github.com/wiktorn)) <!-- 2023-07-29 18:07:21+00:00 -->
|
||||||
|
|
|
@ -116,8 +116,7 @@ module "gcs-bucket" {
|
||||||
module "gcs-bucket-cloudbuild" {
|
module "gcs-bucket-cloudbuild" {
|
||||||
source = "../../../modules/gcs"
|
source = "../../../modules/gcs"
|
||||||
project_id = module.project.project_id
|
project_id = module.project.project_id
|
||||||
name = "${var.prefix}_cloudbuild"
|
name = "${module.project.project_id}_cloudbuild"
|
||||||
prefix = var.prefix
|
|
||||||
location = var.region
|
location = var.region
|
||||||
storage_class = "REGIONAL"
|
storage_class = "REGIONAL"
|
||||||
versioning = false
|
versioning = false
|
||||||
|
@ -137,10 +136,10 @@ module "vpc-local" {
|
||||||
count = local.use_shared_vpc ? 0 : 1
|
count = local.use_shared_vpc ? 0 : 1
|
||||||
source = "../../../modules/net-vpc"
|
source = "../../../modules/net-vpc"
|
||||||
project_id = module.project.project_id
|
project_id = module.project.project_id
|
||||||
name = "default"
|
name = "vertex"
|
||||||
subnets = [
|
subnets = [
|
||||||
{
|
{
|
||||||
"name" : "default",
|
"name" : "subnet-${var.region}",
|
||||||
"region" : "${var.region}",
|
"region" : "${var.region}",
|
||||||
"ip_cidr_range" : "10.4.0.0/24",
|
"ip_cidr_range" : "10.4.0.0/24",
|
||||||
"secondary_ip_range" : null
|
"secondary_ip_range" : null
|
||||||
|
|
|
@ -155,7 +155,7 @@ resource "google_cloudfunctions2_function" "function" {
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "google_cloudfunctions2_function_iam_binding" "default" {
|
resource "google_cloudfunctions2_function_iam_binding" "default" {
|
||||||
for_each = var.iam
|
for_each = local.iam
|
||||||
project = var.project_id
|
project = var.project_id
|
||||||
location = google_cloudfunctions2_function.function.location
|
location = google_cloudfunctions2_function.function.location
|
||||||
cloud_function = google_cloudfunctions2_function.function.name
|
cloud_function = google_cloudfunctions2_function.function.name
|
||||||
|
|
Loading…
Reference in New Issue