Skip to content

Commit

Permalink
fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@mariammartins
mariammartins committed Jun 13, 2024
1 parent 961947f commit cfde161
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 31 deletions.
40 changes: 20 additions & 20 deletions 5-app-infra/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,20 +221,20 @@ Once pushed, the pipeline build logs can be accessed by navigating to the artifa
#### Configuring Cloud Source Repository of Artifact Application
1. Grab the Artifact Project ID
```bash
export ARTIFACT_PROJECT_ID=$(terraform -chdir="gcp-projects/business_unit_3/shared" output -raw common_artifacts_project_id)
echo ${ARTIFACT_PROJECT_ID}
```
1. Clone the freshly minted Cloud Source Repository that was created for this project.
```bash
gcloud source repos clone publish-artifacts --project=${ARTIFACT_PROJECT_ID}
```
1. Enter the repo folder and copy over the artifact files from `5-app-infra/source_repos/artifact-publish` folder.
```bash
cd publish-artifacts
git checkout -b main
Expand All @@ -253,7 +253,7 @@ Once pushed, the pipeline build logs can be accessed by navigating to the artifa
```
1. `cd` out of the `publish-artifacts` repository.
```bash
cd ..
```
Expand All @@ -270,7 +270,7 @@ Although Service Catalog itself must be manually deployed, the modules which wil
The resoning behind utilizing one repository with two deployment methodologies is due to how close interactive (`development`) and operational environments are.
The repository has the structure (truncated for brevity):
```
business_unit_3
├── development
Expand Down Expand Up @@ -382,7 +382,7 @@ The pipeline also listens for changes made to `plan`, `development`, `non-produc
```
1. `cd` out of the `bu3-service-catalog` repository.
```bash
cd ..
```
Expand All @@ -397,13 +397,13 @@ The pipeline also listens for changes made to `plan`, `development`, `non-produc
```
1. Clone the freshly minted Cloud Source Repository that was created for this project.
```bash
gcloud source repos clone service-catalog --project=${SERVICE_CATALOG_PROJECT_ID}
```
1. Enter the repo folder and copy over the service catalogs files from `5-app-infra/source_repos/service-catalog` folder.
```bash
cd service-catalog/
cp -RT ../terraform-google-enterprise-genai/5-app-infra/source_repos/service-catalog/ .
Expand All @@ -412,7 +412,7 @@ The pipeline also listens for changes made to `plan`, `development`, `non-produc
```
1. Commit changes and push main branch to the new repo.
```bash
git add modules
git commit -m 'Initialize Service Catalog Build Repo'
Expand All @@ -421,7 +421,7 @@ The pipeline also listens for changes made to `plan`, `development`, `non-produc
```
1. `cd` out of the `service_catalog` repository.
```bash
cd ..
```
Expand Down Expand Up @@ -525,9 +525,9 @@ unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
```

1. `cd` out of the `artifact-publish`.

```bash
cd
cd
```

1. Navigate to the project that was output from `${ARTIFACT_PROJECT_ID}` in Google's Cloud Console to view the first run of images being built.
Expand All @@ -537,20 +537,20 @@ unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
1. The next instructions assume that you are at the same level of the `terraform-google-enterprise-genai` folder.
1. Grab the Artifact Project ID
```bash
export ARTIFACT_PROJECT_ID=$(terraform -chdir="terraform-google-enterprise-genai/4-projects/business_unit_3/shared" output -raw common_artifacts_project_id)
echo ${ARTIFACT_PROJECT_ID}
```
1. Clone the freshly minted Cloud Source Repository that was created for this project.
```bash
gcloud source repos clone publish-artifacts --project=${ARTIFACT_PROJECT_ID}
```
1. Enter the repo folder and copy over the artifact files from `5-app-infra/source_repos/artifact-publish` folder.
```bash
cd publish-artifacts
git checkout -b main
Expand All @@ -569,7 +569,7 @@ unset GOOGLE_IMPERSONATE_SERVICE_ACCOUNT
```
1. `cd` out of the `publish-artifacts` repository.
```bash
cd ..
```
Expand Down Expand Up @@ -680,13 +680,13 @@ After executing this stage, unset the `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` envir
```
1. Clone the freshly minted Cloud Source Repository that was created for this project.
```bash
gcloud source repos clone service-catalog --project=${SERVICE_CATALOG_PROJECT_ID}
```
1. Enter the repo folder and copy over the service catalogs files from `5-app-infra/source_repos/service-catalog` folder.
```bash
cd service-catalog/
git checkout -b main
Expand All @@ -697,7 +697,7 @@ After executing this stage, unset the `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` envir
```
1. Commit changes and push main branch to the new repo.
```bash
git add modules
git commit -m 'Initialize Service Catalog Build Repo'
Expand All @@ -706,7 +706,7 @@ After executing this stage, unset the `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` envir
```
1. `cd` out of the `service-catalog` repository.
```bash
cd ..
```
Expand Down
21 changes: 10 additions & 11 deletions examples/machine-learning-pipeline/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ In `common.auto.tfvars` update your `perimeter_additional_members` to include:
export prj_c_bu3infra_pipeline_project_id=$(terraform -chdir="../gcp-projects/business_unit_3/shared/" output -raw cloudbuild_project_id)
echo "prj_c_bu3infra_pipeline_project_id = ${prj_c_bu3infra_pipeline_project_id}"
export prj_b_seed_project_id=$(terraform -chdir="../terraform-google-enterprise-genai/0-bootstrap/" output -raw seed_project_id)
echo "prj_b_seed_project_id = ${prj_b_seed_project_id}"
Expand Down Expand Up @@ -119,7 +118,7 @@ Once there, select the perimeter that is associated with the environment (eg. `d

```
ingress_policies = [
// users
{
"from" = {
Expand Down Expand Up @@ -220,7 +219,7 @@ Please refer to [troubleshooting](../docs/TROUBLESHOOTING.md) if you run into is
commands. The `-T` flag is needed for Linux, but causes problems for MacOS.

You will need a github repository set up for this step. This repository houses the DAG's for composer. As of this writing, the structure is as follows:
```
.
├── README.md
Expand Down Expand Up @@ -307,7 +306,7 @@ Run `terraform output cloudbuild_project_id` in the `0-bootstrap` folder to get
```
1. Update the `common.auto.tfvars` file with your github app installation id, along with the url of your repository.
```bash
GITHUB_APP_ID="YOUR-GITHUB-APP-ID-HERE"
GITHUB_REMOTE_URI="YOUR-GITHUB-REMOTE-URI"
Expand Down Expand Up @@ -367,7 +366,7 @@ Run `terraform output cloudbuild_project_id` in the `0-bootstrap` folder to get
```
1. Composer will rely on DAG's from a github repository. In `4-projects`, a secret 'github-api-token' was created to house your github's api access key. We need to create a new version for this secret which will be used in the composer module which is called in the `base_env` folder. Use the script below to add the secrets into each machine learnings respective environment:
```bash
envs=(development non-production production)
project_ids=()
Expand Down Expand Up @@ -585,7 +584,7 @@ After executing this stage, unset the `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` envir
### VPC-SC
1. Now that machine learning's projects have all been inflated, please _return to gcp-projects_ and update COMMON.AUTO.TFVARS with this __additional__ information under `perimeter_additional_members`:

```
"serviceAccount:service-[prj-n-bu3machine-learning-number]@dataflow-service-producer-prod.iam.gserviceaccount.com",
"serviceAccount:[prj-n-bu3machine-learning-number]@cloudbuild.gserviceaccount.com",
Expand All @@ -595,7 +594,7 @@ After executing this stage, unset the `GOOGLE_IMPERSONATE_SERVICE_ACCOUNT` envir
```

2. optional - run the below command to generate a list of the above changes needed to COMMON.AUTO.TFVARS

```bash
ml_n=$(terraform -chdir="gcp-projects/business_unit_3/non-production" output -raw machine_learning_project_number)
ml_p=$(terraform -chdir="gcp-projects/business_unit_3/production" output -raw machine_learning_project_number)
Expand All @@ -615,7 +614,7 @@ Notably:
* "serviceAccount:bq-[prj-d-bu3machine-learning-project-number]@bigquery-encryption.iam.gserviceaccount.com"

This should be added under identities. It should look like this::

```
egress_policies = [
// notebooks
Expand Down Expand Up @@ -644,7 +643,7 @@ Notably:
```

1. Remain in DEVELOPMENT.AUTO.TFVARS and include this entry under `egress_policies`. Ensure you replace all [project numbers] with their corresponding project:

```
// artifact Registry
{
Expand Down Expand Up @@ -683,7 +682,7 @@ Notably:
```

1. Under NON-PRODUCTION.AUTO.TFVARS, add these entries under `egress_policies`:

```
{
"from" = {
Expand Down Expand Up @@ -761,7 +760,7 @@ Notably:
```

1. Under PRODUCTION.AUTO.TFVARS, add these entries under `egress_policies`:

```
{
"from" = {
Expand Down

0 comments on commit cfde161

Please sign in to comment.