Skip to content

Commit 552827d

Browse files
committed
DO NOT MERGE: arbitrary change to trigger CI tests and validate the information produced by Cloud Asset Inventory for use in documentation.
1 parent 0bc707b commit 552827d

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

0-bootstrap/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ resource "google_folder" "bootstrap" {
3838
display_name = "${var.folder_prefix}-bootstrap"
3939
parent = local.parent
4040
}
41-
41+
# arbitrary change to force build
4242
module "seed_bootstrap" {
4343
source = "terraform-google-modules/bootstrap/google"
4444
version = "~> 8.0"

README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ This repository is intended as an example to be forked, tweaked, and maintained
1111
Though this blueprint can help accelerate your foundation design and build, we assume that you have the engineering skills and teams to deploy and customize your own foundation based on your own requirements.
1212

1313
We will support:
14-
- Code is semantically valid, pinned to known good versions, and passes terraform validate and lint checks
15-
- All PR to this repo must pass integration tests to deploy all resources into a test environment before being merged
16-
- Feature requests about ease of use of the code, or feature requests that generally apply to all users, are welcome
14+
15+
- Code is semantically valid, pinned to known good versions, and passes terraform validate and lint checks
16+
- All PR to this repo must pass integration tests to deploy all resources into a test environment before being merged
17+
- Feature requests about ease of use of the code, or feature requests that generally apply to all users, are welcome
1718

1819
We will not support:
19-
- In-place upgrades from a foundation deployed with an earlier version to a more recent version, even for minor version changes, might not be feasible. Repository maintainers do not have visibility to what resources a user deploys on top of their foundation or how the foundation was customized in deployment, so we make no guarantee about avoiding breaking changes.
20-
- Feature requests that are specific to a single user's requirement and not representative of general best practices
20+
21+
- In-place upgrades from a foundation deployed with an earlier version to a more recent version, even for minor version changes, might not be feasible. Repository maintainers do not have visibility to what resources a user deploys on top of their foundation or how the foundation was customized in deployment, so we make no guarantee about avoiding breaking changes.
22+
- Feature requests that are specific to a single user's requirement and not representative of general best practices
2123

2224
## Overview
2325

@@ -47,8 +49,9 @@ The bootstrap step includes:
4749
- VPN connection with on-prem (or wherever your Jenkins Controller is located)
4850

4951
It is a best practice to separate concerns by having two projects here: one for the Terraform state and one for the CI/CD tool.
50-
- The `prj-b-seed` project stores Terraform state and has the service accounts that can create or modify infrastructure.
51-
- The `prj-b-cicd` project holds the CI/CD tool (either Cloud Build or Jenkins) that coordinates the infrastructure deployment.
52+
53+
- The `prj-b-seed` project stores Terraform state and has the service accounts that can create or modify infrastructure.
54+
- The `prj-b-cicd` project holds the CI/CD tool (either Cloud Build or Jenkins) that coordinates the infrastructure deployment.
5255

5356
To further separate the concerns at the IAM level as well, a distinct service account is created for each stage. The Terraform custom service accounts are granted the IAM permissions required to build the foundation.
5457
If using Cloud Build as the CI/CD tool, these service accounts are used directly in the pipeline to execute the pipeline steps (`plan` or `apply`).
@@ -73,7 +76,7 @@ Usage instructions are available in the 0-bootstrap [README](./0-bootstrap/READM
7376
### [1. org](./1-org/)
7477

7578
The purpose of this stage is to set up the common folder used to house projects that contain shared resources such as Security Command Center notification, Cloud Key Management Service (KMS), org level secrets, and org level logging.
76-
This stage also sets up the network folder used to house network related projects such as DNS Hub, Interconnect, network hub, and base and restricted projects for each environment (`development`, `nonproduction` or `production`).
79+
This stage also sets up the network folder used to house network related projects such as DNS Hub, Interconnect, network hub, and base and restricted projects for each environment (`development`, `nonproduction` or `production`).
7780
This will create the following folder and project structure:
7881

7982
```

0 commit comments

Comments
 (0)