switch project service from resourceviews to container in examples

This commit is contained in:
Ludovico Magnocavallo 2020-05-07 21:36:37 +02:00
parent 718f5ceeac
commit b3df6598d4
8 changed files with 14 additions and 14 deletions

View File

@ -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. | <code title="">string</code> | ✓ | |
| organization_id | Organization id. | <code title="">string</code> | ✓ | |
| organization_id | Organization id in organizations/nnnnnnn format. | <code title="">string</code> | ✓ | |
| prefix | Prefix used for resources that need unique names. | <code title="">string</code> | ✓ | |
| root_node | Root node for the new hierarchy, either 'organizations/org_id' or 'folders/folder_id'. | <code title="">string</code> | ✓ | |
| *audit_filter* | Audit log filter used for the log sink. | <code title="">string</code> | | <code title="&#60;&#60;END&#10;logName: &#34;&#47;logs&#47;cloudaudit.googleapis.com&#37;2Factivity&#34;&#10;OR&#10;logName: &#34;&#47;logs&#47;cloudaudit.googleapis.com&#37;2Fsystem_event&#34;&#10;END">...</code> |
@ -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. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="">[]</code> |
| *iam_shared_owners* | Shared services project owners, in IAM format. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="">[]</code> |
| *iam_terraform_owners* | Terraform project owners, in IAM format. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="">[]</code> |
| *project_services* | Service APIs enabled by default in new projects. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="&#91;&#10;&#34;resourceviews.googleapis.com&#34;,&#10;&#34;stackdriver.googleapis.com&#34;,&#10;&#93;">...</code> |
| *project_services* | Service APIs enabled by default in new projects. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="&#91;&#10;&#34;container.googleapis.com&#34;,&#10;&#34;stackdriver.googleapis.com&#34;,&#10;&#93;">...</code> |
## 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. | |

View File

@ -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",
]
}

View File

@ -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. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="">[]</code> |
| *iam_terraform_owners* | Terraform project owners, in IAM format. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="">[]</code> |
| *iam_xpn_config* | Control granting Shared VPC creation roles to service accounts. Target the root node by default. | <code title="object&#40;&#123;&#10;grant &#61; bool&#10;target_org &#61; bool&#10;&#125;&#41;">object({...})</code> | | <code title="&#123;&#10;grant &#61; true&#10;target_org &#61; true&#10;&#125;">...</code> |
| *project_services* | Service APIs enabled by default in new projects. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="&#91;&#10;&#34;resourceviews.googleapis.com&#34;,&#10;&#34;stackdriver.googleapis.com&#34;,&#10;&#93;">...</code> |
| *project_services* | Service APIs enabled by default in new projects. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="&#91;&#10;&#34;container.googleapis.com&#34;,&#10;&#34;stackdriver.googleapis.com&#34;,&#10;&#93;">...</code> |
| *service_account_keys* | Generate and store service account keys in the state file. | <code title="">bool</code> | | <code title="">true</code> |
## Outputs

View File

@ -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",
]
}

View File

@ -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. | <code title="map&#40;string&#41;">map(string)</code> | | <code title="&#123;&#10;hub &#61; &#34;10.0.0.0&#47;24&#34;&#10;spoke-1 &#61; &#34;10.0.16.0&#47;24&#34;&#10;spoke-2 &#61; &#34;10.0.32.0&#47;24&#34;&#10;&#125;">...</code> |
| *ip_secondary_ranges* | Secondary IP CIDR ranges. | <code title="map&#40;string&#41;">map(string)</code> | | <code title="&#123;&#10;spoke-2-pods &#61; &#34;10.128.0.0&#47;18&#34;&#10;spoke-2-services &#61; &#34;172.16.0.0&#47;24&#34;&#10;&#125;">...</code> |
| *private_service_ranges* | Private service IP CIDR ranges. | <code title="map&#40;string&#41;">map(string)</code> | | <code title="&#123;&#10;spoke-2-cluster-1 &#61; &#34;192.168.0.0&#47;28&#34;&#10;&#125;">...</code> |
| *region* | VPC regions. | <code title="">string</code> | | <code title="">europe-west1</code> |
| *region* | VPC region. | <code title="">string</code> | | <code title="">europe-west1</code> |
## Outputs

View File

@ -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. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="">[]</code> |
| *owners_host* | Host project owners, in IAM format. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="">[]</code> |
| *private_service_ranges* | Private service IP CIDR ranges. | <code title="map&#40;string&#41;">map(string)</code> | | <code title="&#123;&#10;cluster-1 &#61; &#34;192.168.0.0&#47;28&#34;&#10;&#125;">...</code> |
| *project_services* | Service APIs enabled by default in new projects. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="&#91;&#10;&#34;resourceviews.googleapis.com&#34;,&#10;&#34;stackdriver.googleapis.com&#34;,&#10;&#93;">...</code> |
| *project_services* | Service APIs enabled by default in new projects. | <code title="list&#40;string&#41;">list(string)</code> | | <code title="&#91;&#10;&#34;container.googleapis.com&#34;,&#10;&#34;stackdriver.googleapis.com&#34;,&#10;&#93;">...</code> |
| *region* | Region used. | <code title="">string</code> | | <code title="">europe-west1</code> |
## Outputs

View File

@ -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",
]
}

View File

@ -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 = {