From 0babd9cad77d8a0c67ba9d5d7f623700907e0f54 Mon Sep 17 00:00:00 2001 From: Steven Borisko Date: Mon, 21 Aug 2023 12:10:13 -0700 Subject: [PATCH 1/2] fix example urls (#289) --- a3/examples/gke-beta/README.md | 6 +++--- a3/examples/gke-beta/blueprint.yaml | 2 +- a3/examples/gke-beta/main.tf | 2 +- a3/examples/gke/README.md | 6 +++--- a3/examples/gke/blueprint.yaml | 2 +- a3/examples/gke/main.tf | 2 +- a3/examples/mig-cos/README.md | 6 +++--- a3/examples/mig-cos/blueprint.yaml | 2 +- a3/examples/mig-cos/main.tf | 2 +- .../terraform/modules/cluster/mig-cos/input/simple.tfvars | 1 + 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/a3/examples/gke-beta/README.md b/a3/examples/gke-beta/README.md index f87ba87b3..bd64c31e2 100644 --- a/a3/examples/gke-beta/README.md +++ b/a3/examples/gke-beta/README.md @@ -32,7 +32,7 @@ Required variables: # How to create this cluster -Refer to [this section](../../README.md#how-to-provision-a-cluster). +Refer to [this section](../../../README.md#how-to-provision-a-cluster). ## Requirements @@ -47,7 +47,7 @@ No providers. | Name | Source | Version | |------|--------|---------| -| [a3-gke-beta](#module\_a3-gke-beta) | github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/gke-beta | n/a | +| [a3-gke-beta](#module\_a3-gke-beta) | github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/gke-beta | n/a | ## Resources @@ -64,4 +64,4 @@ No resources. ## Outputs No outputs. - \ No newline at end of file + diff --git a/a3/examples/gke-beta/blueprint.yaml b/a3/examples/gke-beta/blueprint.yaml index dd9f7653a..0012a3226 100644 --- a/a3/examples/gke-beta/blueprint.yaml +++ b/a3/examples/gke-beta/blueprint.yaml @@ -32,4 +32,4 @@ deployment_groups: - group: primary modules: - id: a3-gke-beta - source: "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/gke-beta" + source: "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/gke-beta" diff --git a/a3/examples/gke-beta/main.tf b/a3/examples/gke-beta/main.tf index 3be396389..3e9bb8b98 100644 --- a/a3/examples/gke-beta/main.tf +++ b/a3/examples/gke-beta/main.tf @@ -3,7 +3,7 @@ variable "project_id" {} variable "resource_prefix" {} module "a3-gke-beta" { - source = "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/gke-beta" + source = "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/gke-beta" node_pools = var.node_pools project_id = var.project_id diff --git a/a3/examples/gke/README.md b/a3/examples/gke/README.md index fef09fc9b..d7de81cd9 100644 --- a/a3/examples/gke/README.md +++ b/a3/examples/gke/README.md @@ -26,7 +26,7 @@ Required variables: # How to create this cluster -Refer to [this section](../../README.md#how-to-provision-a-cluster). +Refer to [this section](../../../README.md#how-to-provision-a-cluster). ## Requirements @@ -41,7 +41,7 @@ No providers. | Name | Source | Version | |------|--------|---------| -| [a3-gke](#module\_a3-gke) | github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/gke | n/a | +| [a3-gke](#module\_a3-gke) | github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/gke | n/a | ## Resources @@ -58,4 +58,4 @@ No resources. ## Outputs No outputs. - \ No newline at end of file + diff --git a/a3/examples/gke/blueprint.yaml b/a3/examples/gke/blueprint.yaml index 5e36a102d..873bf619c 100644 --- a/a3/examples/gke/blueprint.yaml +++ b/a3/examples/gke/blueprint.yaml @@ -32,4 +32,4 @@ deployment_groups: - group: primary modules: - id: a3-gke - source: "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/gke" + source: "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/gke" diff --git a/a3/examples/gke/main.tf b/a3/examples/gke/main.tf index ab7f37436..4206dd97a 100644 --- a/a3/examples/gke/main.tf +++ b/a3/examples/gke/main.tf @@ -3,7 +3,7 @@ variable "project_id" {} variable "resource_prefix" {} module "a3-gke" { - source = "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/gke" + source = "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/gke" node_pools = var.node_pools project_id = var.project_id diff --git a/a3/examples/mig-cos/README.md b/a3/examples/mig-cos/README.md index 92e607d1d..857418084 100644 --- a/a3/examples/mig-cos/README.md +++ b/a3/examples/mig-cos/README.md @@ -25,7 +25,7 @@ Required variables: # How to create this cluster -Refer to [this section](../../README.md#how-to-provision-a-cluster). +Refer to [this section](../../../README.md#how-to-provision-a-cluster). ## Requirements @@ -40,7 +40,7 @@ No providers. | Name | Source | Version | |------|--------|---------| -| [a3-mig-cos](#module\_a3-mig-cos) | github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/mig-cos | n/a | +| [a3-mig-cos](#module\_a3-mig-cos) | github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/mig-cos | n/a | ## Resources @@ -58,4 +58,4 @@ No resources. ## Outputs No outputs. - \ No newline at end of file + diff --git a/a3/examples/mig-cos/blueprint.yaml b/a3/examples/mig-cos/blueprint.yaml index cbf421f52..934706681 100644 --- a/a3/examples/mig-cos/blueprint.yaml +++ b/a3/examples/mig-cos/blueprint.yaml @@ -32,4 +32,4 @@ deployment_groups: - group: primary modules: - id: a3-mig-cos - source: "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/mig-cos" + source: "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/mig-cos" diff --git a/a3/examples/mig-cos/main.tf b/a3/examples/mig-cos/main.tf index c31c84fa9..6fbcc763d 100644 --- a/a3/examples/mig-cos/main.tf +++ b/a3/examples/mig-cos/main.tf @@ -4,7 +4,7 @@ variable "region" {} variable "resource_prefix" {} module "a3-mig-cos" { - source = "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//terraform/modules/cluster/mig-cos" + source = "github.com/GoogleCloudPlatform/ai-infra-cluster-provisioning//a3/terraform/modules/cluster/mig-cos" instance_groups = var.instance_groups project_id = var.project_id diff --git a/test/continuous/a3/terraform/modules/cluster/mig-cos/input/simple.tfvars b/test/continuous/a3/terraform/modules/cluster/mig-cos/input/simple.tfvars index feb3de2f6..9d06eb76f 100644 --- a/test/continuous/a3/terraform/modules/cluster/mig-cos/input/simple.tfvars +++ b/test/continuous/a3/terraform/modules/cluster/mig-cos/input/simple.tfvars @@ -8,3 +8,4 @@ instance_groups = [ zone = "us-east4-a" }, ] +region = "us-east4" From 3e622f5c225504fdf550b3788e432402f6528fe3 Mon Sep 17 00:00:00 2001 From: Steven Borisko Date: Mon, 21 Aug 2023 12:11:42 -0700 Subject: [PATCH 2/2] bump version --- cloudbuild-continuous.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild-continuous.yaml b/cloudbuild-continuous.yaml index 8150548db..13347054a 100644 --- a/cloudbuild-continuous.yaml +++ b/cloudbuild-continuous.yaml @@ -46,4 +46,4 @@ images: timeout: 5400s substitutions: - _VERSION: 'v1.0.0' + _VERSION: 'v1.0.1'