From 63dffdc1192e72c8167e77988c6d569c92560275 Mon Sep 17 00:00:00 2001 From: rogerthatdev Date: Tue, 25 Jul 2023 10:07:59 -0700 Subject: [PATCH] make docker_generate_docs --- infra/examples/simple_example/README.md | 5 ++++- infra/metadata.display.yaml | 3 +++ infra/metadata.yaml | 29 ++++++++++++++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/infra/examples/simple_example/README.md b/infra/examples/simple_example/README.md index e4aee5f9c..2da11699c 100644 --- a/infra/examples/simple_example/README.md +++ b/infra/examples/simple_example/README.md @@ -11,7 +11,10 @@ This example illustrates how to use the `dynamic-javascript-webapp` module. ## Outputs -No output. +| Name | Description | +|------|-------------| +| frontend\_url | IP address to site. Load balancer expected to take ~5 minutes for it to warm up. | +| run\_service\_name | The name of the deployed Cloud Run service. | diff --git a/infra/metadata.display.yaml b/infra/metadata.display.yaml index 91de776ea..6ded1ca3e 100644 --- a/infra/metadata.display.yaml +++ b/infra/metadata.display.yaml @@ -16,12 +16,15 @@ apiVersion: blueprints.cloud.google.com/v1alpha1 kind: BlueprintMetadata metadata: name: terraform-dynamic-javascript-webapp-display + annotations: + config.kubernetes.io/local-config: "true" spec: info: title: terraform-dynamic-javascript-webapp source: repo: https://github.com/GoogleCloudPlatform/terraform-dynamic-javascript-webapp.git sourceType: git + dir: /infra ui: input: variables: diff --git a/infra/metadata.yaml b/infra/metadata.yaml index 2d2f668bc..3d90ef3e9 100644 --- a/infra/metadata.yaml +++ b/infra/metadata.yaml @@ -24,6 +24,7 @@ spec: source: repo: https://github.com/GoogleCloudPlatform/terraform-dynamic-javascript-webapp.git sourceType: git + dir: /infra version: 0.0.1 actuationTool: flavor: Terraform @@ -34,8 +35,8 @@ spec: preDeploy: To deploy this blueprint you must have an active billing account and billing permissions. content: examples: - - name: deploy_webapp - location: examples/deploy_webapp + - name: simple_example + location: examples/simple_example interfaces: variables: - name: deployment_name @@ -73,8 +74,30 @@ spec: roles: - level: Project roles: - - roles/owner + - roles/browser + - roles/cloudasset.viewer + - roles/compute.loadBalancerAdmin + - roles/compute.networkAdmin + - roles/firebase.developAdmin + - roles/iam.serviceAccountCreator + - roles/iam.serviceAccountDeleter + - roles/iam.serviceAccountUser + - roles/resourcemanager.projectIamAdmin + - roles/run.admin + - roles/secretmanager.admin + - roles/serviceusage.serviceUsageAdmin + - roles/storage.admin services: + - cloudasset.googleapis.com + - cloudbuild.googleapis.com - cloudresourcemanager.googleapis.com + - compute.googleapis.com + - firestore.googleapis.com + - iam.googleapis.com + - run.googleapis.com + - secretmanager.googleapis.com + - serviceusage.googleapis.com + - storage.googleapis.com - storage-api.googleapis.com - serviceusage.googleapis.com + - cloudasset.googleapis.com