diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ea8ed93..675f2b7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,13 @@ All notable changes to this project will be documented in this file. ### BLUEPRINTS +- [[#897](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/897)] Project-factory: allow folder_id to be defined in defaults_file ([Malet](https://github.com/Malet)) +- [[#900](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/900)] Improve net dashboard variables ([juliocc](https://github.com/juliocc)) +- [[#896](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/896)] Network Dashboard: CFv2 and performance improvements ([aurelienlegrand](https://github.com/aurelienlegrand)) +- [[#871](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/871)] Firewall Policy Metrics, parallel writes, aligned timestamps ([maunope](https://github.com/maunope)) +- [[#884](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/884)] BigQuery factory blueprint ([marcjwo](https://github.com/marcjwo)) +- [[#889](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/889)] Minor fixes to PSC hybrid blueprint readmes ([LucaPrete](https://github.com/LucaPrete)) +- [[#888](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/888)] Let the cloudsql module generate a random password ([skalolazka](https://github.com/skalolazka)) - [[#879](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/879)] New PSC hybrid blueprint ([LucaPrete](https://github.com/LucaPrete)) - [[#880](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/880)] **incompatible change:** Refactor net-vpc module for Terraform 1.3 ([ludoo](https://github.com/ludoo)) - [[#872](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/872)] added support 2nd generation cloud function ([som-nitjsr](https://github.com/som-nitjsr)) @@ -30,12 +37,14 @@ All notable changes to this project will be documented in this file. ### DOCUMENTATION +- [[#898](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/898)] Update FAST bootstrap README.md ([juliocc](https://github.com/juliocc)) - [[#878](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/878)] chore: update cft and fabric ([bharathkkb](https://github.com/bharathkkb)) - [[#863](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/863)] Fabric vs CFT doc ([ludoo](https://github.com/ludoo)) - [[#806](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/806)] FAST Companion Guide ([ajlopezn](https://github.com/ajlopezn)) ### FAST +- [[#898](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/898)] Update FAST bootstrap README.md ([juliocc](https://github.com/juliocc)) - [[#880](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/880)] **incompatible change:** Refactor net-vpc module for Terraform 1.3 ([ludoo](https://github.com/ludoo)) - [[#875](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/875)] **incompatible change:** Refactor GKE nodepool for Terraform 1.3, refactor GKE blueprints and FAST stage ([ludoo](https://github.com/ludoo)) - [[#566](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/566)] FAST: Separate network environment ([sruffilli](https://github.com/sruffilli)) @@ -53,6 +62,7 @@ All notable changes to this project will be documented in this file. ### MODULES +- [[#891](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/891)] Add internal_ips output to compute-vm module ([LucaPrete](https://github.com/LucaPrete)) - [[#890](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/890)] Add auto_delete and instance_redistribution_type to compute-vm and compute-mig modules. ([giovannibaratta](https://github.com/giovannibaratta)) - [[#883](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/883)] Fix csi-driver, logging and monitoring default values when autopilot … ([danielmarzini](https://github.com/danielmarzini)) - [[#880](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/880)] **incompatible change:** Refactor net-vpc module for Terraform 1.3 ([ludoo](https://github.com/ludoo)) @@ -83,6 +93,7 @@ All notable changes to this project will be documented in this file. ### TOOLS +- [[#902](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/902)] Bring back sorted variables check ([juliocc](https://github.com/juliocc)) - [[#887](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/887)] Disable parallel execution of tests and plugin cache ([ludoo](https://github.com/ludoo)) - [[#886](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/886)] Revert "Improve handling of tf plugin cache in tests" ([ludoo](https://github.com/ludoo)) - [[#885](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/885)] Improve handling of tf plugin cache in tests ([ludoo](https://github.com/ludoo)) diff --git a/fast/stages/03-project-factory/dev/main.tf b/fast/stages/03-project-factory/dev/main.tf index 58421193..e0deb248 100644 --- a/fast/stages/03-project-factory/dev/main.tf +++ b/fast/stages/03-project-factory/dev/main.tf @@ -41,7 +41,7 @@ module "projects" { billing_alert = try(each.value.billing_alert, null) dns_zones = try(each.value.dns_zones, []) essential_contacts = try(each.value.essential_contacts, []) - folder_id = each.value.folder_id + folder_id = try(each.value.folder_id, local.defaults.folder_id) group_iam = try(each.value.group_iam, {}) iam = try(each.value.iam, {}) kms_service_agents = try(each.value.kms, {}) diff --git a/modules/compute-vm/README.md b/modules/compute-vm/README.md index c04caa6c..170a2e9d 100644 --- a/modules/compute-vm/README.md +++ b/modules/compute-vm/README.md @@ -315,12 +315,13 @@ module "instance-group" { | [group](outputs.tf#L26) | Instance group resource. | | | [instance](outputs.tf#L31) | Instance resource. | | | [internal_ip](outputs.tf#L36) | Instance main interface internal IP address. | | -| [self_link](outputs.tf#L44) | Instance self links. | | -| [service_account](outputs.tf#L49) | Service account resource. | | -| [service_account_email](outputs.tf#L56) | Service account email. | | -| [service_account_iam_email](outputs.tf#L61) | Service account email. | | -| [template](outputs.tf#L69) | Template resource. | | -| [template_name](outputs.tf#L74) | Template name. | | +| [internal_ips](outputs.tf#L44) | Instance interfaces internal IP addresses. | | +| [self_link](outputs.tf#L52) | Instance self links. | | +| [service_account](outputs.tf#L57) | Service account resource. | | +| [service_account_email](outputs.tf#L64) | Service account email. | | +| [service_account_iam_email](outputs.tf#L69) | Service account email. | | +| [template](outputs.tf#L77) | Template resource. | | +| [template_name](outputs.tf#L82) | Template name. | | ## TODO diff --git a/modules/compute-vm/outputs.tf b/modules/compute-vm/outputs.tf index 523924f9..32c9ef9c 100644 --- a/modules/compute-vm/outputs.tf +++ b/modules/compute-vm/outputs.tf @@ -41,6 +41,14 @@ output "internal_ip" { ) } +output "internal_ips" { + description = "Instance interfaces internal IP addresses." + value = [ + for nic in try(google_compute_instance.default.0.network_interface, []) + : nic.network_ip + ] +} + output "self_link" { description = "Instance self links." value = try(google_compute_instance.default.0.self_link, null)