From b3df6598d45527dc08325cf440b2cdb2b3aa51f9 Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Thu, 7 May 2020 21:36:37 +0200 Subject: [PATCH] switch project service from resourceviews to container in examples --- foundations/business-units/README.md | 12 ++++++------ foundations/business-units/variables.tf | 2 +- foundations/environments/README.md | 2 +- foundations/environments/variables.tf | 2 +- infrastructure/hub-and-spoke-peering/README.md | 2 +- infrastructure/shared-vpc-gke/README.md | 2 +- infrastructure/shared-vpc-gke/variables.tf | 2 +- modules/project/README.md | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/foundations/business-units/README.md b/foundations/business-units/README.md index 7c740458..36d80ecc 100644 --- a/foundations/business-units/README.md +++ b/foundations/business-units/README.md @@ -31,7 +31,7 @@ This sample uses a top-level folder to encapsulate projects that host resources | name | description | type | required | default | |---|---|:---: |:---:|:---:| | billing_account_id | Billing account id used as default for new projects. | string | ✓ | | -| organization_id | Organization id. | string | ✓ | | +| organization_id | Organization id in organizations/nnnnnnn format. | string | ✓ | | | prefix | Prefix used for resources that need unique names. | string | ✓ | | | root_node | Root node for the new hierarchy, either 'organizations/org_id' or 'folders/folder_id'. | string | ✓ | | | *audit_filter* | Audit log filter used for the log sink. | string | | ... | @@ -40,7 +40,7 @@ This sample uses a top-level folder to encapsulate projects that host resources | *iam_audit_viewers* | Audit project viewers, in IAM format. | list(string) | | [] | | *iam_shared_owners* | Shared services project owners, in IAM format. | list(string) | | [] | | *iam_terraform_owners* | Terraform project owners, in IAM format. | list(string) | | [] | -| *project_services* | Service APIs enabled by default in new projects. | list(string) | | ... | +| *project_services* | Service APIs enabled by default in new projects. | list(string) | | ... | ## Outputs @@ -48,10 +48,10 @@ This sample uses a top-level folder to encapsulate projects that host resources |---|---|:---:| | audit_logs_project | Project that holds the audit logs export resources. | | | bootstrap_tf_gcs_bucket | GCS bucket used for the bootstrap Terraform state. | | -| bu_bi | Business Intelligence attributes. | | -| bu_bi_sa_keys | Business Intelligence service account keys. | ✓ | -| bu_ml | Machine Learning attributes. | | -| bu_ml_sa_keys | Machine Learning service account keys. | ✓ | +| bu_business_intelligence | Business Intelligence attributes. | | +| bu_business_intelligence_keys | Business Intelligence service account keys. | ✓ | +| bu_machine_learning | Machine Learning attributes. | | +| bu_machine_learning_keys | Machine Learning service account keys. | ✓ | | shared_folder_id | Shared folder id. | | | shared_resources_project | Project that holdes resources shared across business units. | | | terraform_project | Project that holds the base Terraform resources. | | diff --git a/foundations/business-units/variables.tf b/foundations/business-units/variables.tf index 393d7635..e970be99 100644 --- a/foundations/business-units/variables.tf +++ b/foundations/business-units/variables.tf @@ -80,7 +80,7 @@ variable "project_services" { description = "Service APIs enabled by default in new projects." type = list(string) default = [ - "resourceviews.googleapis.com", + "container.googleapis.com", "stackdriver.googleapis.com", ] } diff --git a/foundations/environments/README.md b/foundations/environments/README.md index 8f5c361a..91ba7aa4 100644 --- a/foundations/environments/README.md +++ b/foundations/environments/README.md @@ -47,7 +47,7 @@ If no shared services are needed, the shared service project module can of cours | *iam_sharedsvc_owners* | Shared services project owners, in IAM format. | list(string) | | [] | | *iam_terraform_owners* | Terraform project owners, in IAM format. | list(string) | | [] | | *iam_xpn_config* | Control granting Shared VPC creation roles to service accounts. Target the root node by default. | object({...}) | | ... | -| *project_services* | Service APIs enabled by default in new projects. | list(string) | | ... | +| *project_services* | Service APIs enabled by default in new projects. | list(string) | | ... | | *service_account_keys* | Generate and store service account keys in the state file. | bool | | true | ## Outputs diff --git a/foundations/environments/variables.tf b/foundations/environments/variables.tf index 482e5da4..a868140d 100644 --- a/foundations/environments/variables.tf +++ b/foundations/environments/variables.tf @@ -122,7 +122,7 @@ variable "project_services" { description = "Service APIs enabled by default in new projects." type = list(string) default = [ - "resourceviews.googleapis.com", + "container.googleapis.com", "stackdriver.googleapis.com", ] } diff --git a/infrastructure/hub-and-spoke-peering/README.md b/infrastructure/hub-and-spoke-peering/README.md index 3a23ba96..85599bf5 100644 --- a/infrastructure/hub-and-spoke-peering/README.md +++ b/infrastructure/hub-and-spoke-peering/README.md @@ -86,7 +86,7 @@ The VPN used to connect the GKE masters VPC does not account for HA, upgrading t | *ip_ranges* | IP CIDR ranges. | map(string) | | ... | | *ip_secondary_ranges* | Secondary IP CIDR ranges. | map(string) | | ... | | *private_service_ranges* | Private service IP CIDR ranges. | map(string) | | ... | -| *region* | VPC regions. | string | | europe-west1 | +| *region* | VPC region. | string | | europe-west1 | ## Outputs diff --git a/infrastructure/shared-vpc-gke/README.md b/infrastructure/shared-vpc-gke/README.md index 1ddeb39a..7531fcbd 100644 --- a/infrastructure/shared-vpc-gke/README.md +++ b/infrastructure/shared-vpc-gke/README.md @@ -58,7 +58,7 @@ There's a minor glitch that can surface running `terraform destroy`, where the s | *owners_gke* | GKE project owners, in IAM format. | list(string) | | [] | | *owners_host* | Host project owners, in IAM format. | list(string) | | [] | | *private_service_ranges* | Private service IP CIDR ranges. | map(string) | | ... | -| *project_services* | Service APIs enabled by default in new projects. | list(string) | | ... | +| *project_services* | Service APIs enabled by default in new projects. | list(string) | | ... | | *region* | Region used. | string | | europe-west1 | ## Outputs diff --git a/infrastructure/shared-vpc-gke/variables.tf b/infrastructure/shared-vpc-gke/variables.tf index a69be5b6..154dc6a8 100644 --- a/infrastructure/shared-vpc-gke/variables.tf +++ b/infrastructure/shared-vpc-gke/variables.tf @@ -81,7 +81,7 @@ variable "project_services" { description = "Service APIs enabled by default in new projects." type = list(string) default = [ - "resourceviews.googleapis.com", + "container.googleapis.com", "stackdriver.googleapis.com", ] } diff --git a/modules/project/README.md b/modules/project/README.md index a8283632..582b7b29 100644 --- a/modules/project/README.md +++ b/modules/project/README.md @@ -12,7 +12,7 @@ module "project" { parent = "folders/1234567890" prefix = "foo" services = [ - "resourceviews.googleapis.com", + "container.googleapis.com", "stackdriver.googleapis.com" ] iam_roles = ["roles/container.hostServiceAgentUser"] @@ -34,7 +34,7 @@ module "project" { parent = "folders/1234567890" prefix = "foo" services = [ - "resourceviews.googleapis.com", + "container.googleapis.com", "stackdriver.googleapis.com" ] policy_boolean = {