Skip to content

Commit

Permalink
chore(docs): Used 'Cloud Build' and 'Artifact Registry (AR) in all in…
Browse files Browse the repository at this point in the history
…s… (#931)
  • Loading branch information
caleonardo authored Feb 23, 2023
1 parent 340915f commit 48b7a77
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions 0-bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,13 @@ Each step has instructions for this change.
| cloud\_build\_private\_worker\_pool\_id | ID of the Cloud Build private worker pool. |
| cloud\_build\_worker\_peered\_ip\_range | The IP range of the peered service network. |
| cloud\_build\_worker\_range\_id | The Cloud Build private worker IP range ID. |
| cloud\_builder\_artifact\_repo | GAR Repo created to store TF Cloud Builder images. |
| cloudbuild\_project\_id | Project where CloudBuild configuration and terraform container image will reside. |
| cloud\_builder\_artifact\_repo | Artifact Registry (AR) Repository created to store TF Cloud Builder images. |
| cloudbuild\_project\_id | Project where Cloud Build configuration and terraform container image will reside. |
| common\_config | Common configuration data to be used in other steps. |
| csr\_repos | List of Cloud Source Repos created by the module, linked to Cloud Build triggers. |
| environment\_step\_terraform\_service\_account\_email | Environment Step Terraform Account |
| gcs\_bucket\_cloudbuild\_artifacts | Bucket used to store Cloud/Build artifacts in CloudBuild project. |
| gcs\_bucket\_cloudbuild\_logs | Bucket used to store Cloud/Build logs in CloudBuild project. |
| gcs\_bucket\_cloudbuild\_artifacts | Bucket used to store Cloud Build artifacts in cicd project. |
| gcs\_bucket\_cloudbuild\_logs | Bucket used to store Cloud Build logs in cicd project. |
| gcs\_bucket\_tfstate | Bucket used for storing terraform state for Foundations Pipelines in Seed Project. |
| group\_billing\_admins | Google Group for GCP Billing Administrators. |
| group\_org\_admins | Google Group for GCP Organization Administrators. |
Expand Down
8 changes: 4 additions & 4 deletions 0-bootstrap/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,17 @@ output "optional_groups" {
---------------------------------------- */
# Comment-out the cloudbuild_bootstrap module and its outputs if you want to use Jenkins instead of Cloud Build
output "cloudbuild_project_id" {
description = "Project where CloudBuild configuration and terraform container image will reside."
description = "Project where Cloud Build configuration and terraform container image will reside."
value = module.tf_source.cloudbuild_project_id
}

output "gcs_bucket_cloudbuild_artifacts" {
description = "Bucket used to store Cloud/Build artifacts in CloudBuild project."
description = "Bucket used to store Cloud Build artifacts in cicd project."
value = { for key, value in module.tf_workspace : key => replace(value.artifacts_bucket, local.bucket_self_link_prefix, "") }
}

output "gcs_bucket_cloudbuild_logs" {
description = "Bucket used to store Cloud/Build logs in CloudBuild project."
description = "Bucket used to store Cloud Build logs in cicd project."
value = { for key, value in module.tf_workspace : key => replace(value.logs_bucket, local.bucket_self_link_prefix, "") }
}

Expand All @@ -108,7 +108,7 @@ output "projects_gcs_bucket_tfstate" {
}

output "cloud_builder_artifact_repo" {
description = "GAR Repo created to store TF Cloud Builder images."
description = "Artifact Registry (AR) Repository created to store TF Cloud Builder images."
value = "projects/${module.tf_source.cloudbuild_project_id}/locations/${var.default_region}/repositories/${module.tf_cloud_builder.artifact_repo}"
}

Expand Down
4 changes: 2 additions & 2 deletions 4-projects/modules/infra_pipelines/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| app\_infra\_repos | A list of Cloud Source Repos to be created to hold app infra Terraform configs. | `list(string)` | n/a | yes |
| billing\_account | The ID of the billing account to associated this project with. | `string` | n/a | yes |
| bucket\_prefix | Name prefix to use for state bucket created. | `string` | `"bkt"` | no |
| cloud\_builder\_artifact\_repo | GAR Repo that stores TF Cloud Builder images. | `string` | n/a | yes |
| cloud\_builder\_artifact\_repo | Artifact Registry (AR) repository that stores TF Cloud Builder images. | `string` | n/a | yes |
| cloudbuild\_project\_id | The project id where the pipelines and repos should be created. | `string` | n/a | yes |
| default\_region | Default region to create resources where applicable. | `string` | n/a | yes |
| org\_id | GCP Organization ID | `string` | n/a | yes |
Expand All @@ -21,7 +21,7 @@
| apply\_triggers\_id | CB apply triggers |
| artifact\_buckets | GCS Buckets to store Cloud Build Artifacts |
| default\_region | Default region to create resources where applicable. |
| gar\_name | GAR Repo name created to store runner images |
| gar\_name | Artifact Registry (AR) repository name created to store runner images |
| log\_buckets | GCS Buckets to store Cloud Build logs |
| plan\_triggers\_id | CB plan triggers |
| repos | CSRs to store source code |
Expand Down
2 changes: 1 addition & 1 deletion 4-projects/modules/infra_pipelines/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ output "terraform_service_accounts" {
}

output "gar_name" {
description = "GAR Repo name created to store runner images"
description = "Artifact Registry (AR) repository name created to store runner images"
value = local.gar_name
}

Expand Down
2 changes: 1 addition & 1 deletion 4-projects/modules/infra_pipelines/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ variable "terraform_docker_tag_version" {
}

variable "cloud_builder_artifact_repo" {
description = "GAR Repo that stores TF Cloud Builder images."
description = "Artifact Registry (AR) repository that stores TF Cloud Builder images."
type = string

}
Expand Down

0 comments on commit 48b7a77

Please sign in to comment.