From 8fa85df5b17628e707e4a4135c86829dc3d2972c Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Thu, 31 Oct 2024 22:43:30 +0000 Subject: [PATCH] update template --- autogen/variables.tf.tmpl | 4 ++-- examples/confidential_computing/main.tf | 2 +- examples/instance_template/confidential_computing/main.tf | 2 +- modules/mig/README.md | 4 ++-- modules/mig/metadata.yaml | 4 ++-- modules/mig/variables.tf | 4 ++-- modules/mig_with_percent/README.md | 4 ++-- modules/mig_with_percent/metadata.yaml | 4 ++-- modules/mig_with_percent/variables.tf | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/autogen/variables.tf.tmpl b/autogen/variables.tf.tmpl index 324cb280..c5f470b8 100644 --- a/autogen/variables.tf.tmpl +++ b/autogen/variables.tf.tmpl @@ -18,7 +18,7 @@ variable "project_id" { type = string - description = "The GCP project ID" + description = "The Google Cloud project ID" default = null } @@ -35,7 +35,7 @@ variable "mig_name" { } variable "region" { - description = "The GCP region where the managed instance group resides." + description = "The Google Cloud region where the managed instance group resides." type = string } diff --git a/examples/confidential_computing/main.tf b/examples/confidential_computing/main.tf index a958c944..8f8a64d3 100644 --- a/examples/confidential_computing/main.tf +++ b/examples/confidential_computing/main.tf @@ -65,7 +65,7 @@ resource "google_kms_crypto_key_iam_binding" "crypto_key" { } module "instance_template" { - source = "terraform-google-modules/vm/google//modules/instance_template" + source = "terraform-google-modules/vm/google//modules/instance_template" version = "~> 12.0" region = var.region diff --git a/examples/instance_template/confidential_computing/main.tf b/examples/instance_template/confidential_computing/main.tf index 15ac2b8b..77476a54 100644 --- a/examples/instance_template/confidential_computing/main.tf +++ b/examples/instance_template/confidential_computing/main.tf @@ -15,7 +15,7 @@ */ module "instance_template" { - source = "terraform-google-modules/vm/google//modules/instance_template" + source = "terraform-google-modules/vm/google//modules/instance_template" version = "~> 12.0" region = var.region diff --git a/modules/mig/README.md b/modules/mig/README.md index baace6dc..b8d59c4a 100644 --- a/modules/mig/README.md +++ b/modules/mig/README.md @@ -38,8 +38,8 @@ The current version is 2.X. The following guides are available to assist with up | mig\_timeouts | Times for creation, deleting and updating the MIG resources. Can be helpful when using wait\_for\_instances to allow a longer VM startup time. | 
object({
    create = string
    update = string
    delete = string
  })
| 
{
  "create": "5m",
  "delete": "15m",
  "update": "5m"
}
| no | | min\_replicas | The minimum number of replicas that the autoscaler can scale down to. This cannot be less than 0. | `number` | `2` | no | | named\_ports | Named name and named port. https://cloud.google.com/load-balancing/docs/backend-service#named_ports | 
list(object({
    name = string
    port = number
  }))
| `[]` | no | -| project\_id | The GCP project ID | `string` | `null` | no | -| region | The GCP region where the managed instance group resides. | `string` | n/a | yes | +| project\_id | The Google Cloud project ID | `string` | `null` | no | +| region | The Google Cloud region where the managed instance group resides. | `string` | n/a | yes | | scaling\_schedules | Autoscaling, scaling schedule block. https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_autoscaler#scaling_schedules | 
list(object({
    disabled              = bool
    duration_sec          = number
    min_required_replicas = number
    name                  = string
    schedule              = string
    time_zone             = string
  }))
| `[]` | no | | stateful\_disks | Disks created on the instances that will be preserved on instance delete. https://cloud.google.com/compute/docs/instance-groups/configuring-stateful-disks-in-migs | 
list(object({
    device_name = string
    delete_rule = string
  }))
| `[]` | no | | stateful\_ips | Statful IPs created on the instances that will be preserved on instance delete. https://cloud.google.com/compute/docs/instance-groups/configuring-stateful-ip-addresses-in-migs | 
list(object({
    interface_name = string
    delete_rule    = string
    is_external    = bool
  }))
| `[]` | no | diff --git a/modules/mig/metadata.yaml b/modules/mig/metadata.yaml index a26d3952..0982991b 100644 --- a/modules/mig/metadata.yaml +++ b/modules/mig/metadata.yaml @@ -81,7 +81,7 @@ spec: interfaces: variables: - name: project_id - description: The GCP project ID + description: The Google Cloud project ID varType: string - name: hostname description: Hostname prefix for instances @@ -92,7 +92,7 @@ spec: varType: string defaultValue: "" - name: region - description: The GCP region where the managed instance group resides. + description: The Google Cloud region where the managed instance group resides. varType: string required: true - name: instance_template diff --git a/modules/mig/variables.tf b/modules/mig/variables.tf index 42fd903f..a4de8132 100644 --- a/modules/mig/variables.tf +++ b/modules/mig/variables.tf @@ -18,7 +18,7 @@ variable "project_id" { type = string - description = "The GCP project ID" + description = "The Google Cloud project ID" default = null } @@ -35,7 +35,7 @@ variable "mig_name" { } variable "region" { - description = "The GCP region where the managed instance group resides." + description = "The Google Cloud region where the managed instance group resides." type = string } diff --git a/modules/mig_with_percent/README.md b/modules/mig_with_percent/README.md index 4f03d687..af5c24a0 100644 --- a/modules/mig_with_percent/README.md +++ b/modules/mig_with_percent/README.md @@ -39,8 +39,8 @@ The current version is 2.X. The following guides are available to assist with up | min\_replicas | The minimum number of replicas that the autoscaler can scale down to. This cannot be less than 0. | `number` | `2` | no | | named\_ports | Named name and named port. https://cloud.google.com/load-balancing/docs/backend-service#named_ports | 
list(object({
    name = string
    port = number
  }))
| `[]` | no | | next\_version\_percent | Percentage of instances defined in the second version | `number` | n/a | yes | -| project\_id | The GCP project ID | `string` | `null` | no | -| region | The GCP region where the managed instance group resides. | `string` | n/a | yes | +| project\_id | The Google Cloud project ID | `string` | `null` | no | +| region | The Google Cloud region where the managed instance group resides. | `string` | n/a | yes | | scaling\_schedules | Autoscaling, scaling schedule block. https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_autoscaler#scaling_schedules | 
list(object({
    disabled              = bool
    duration_sec          = number
    min_required_replicas = number
    name                  = string
    schedule              = string
    time_zone             = string
  }))
| `[]` | no | | stateful\_disks | Disks created on the instances that will be preserved on instance delete. https://cloud.google.com/compute/docs/instance-groups/configuring-stateful-disks-in-migs | 
list(object({
    device_name = string
    delete_rule = string
  }))
| `[]` | no | | stateful\_ips | Statful IPs created on the instances that will be preserved on instance delete. https://cloud.google.com/compute/docs/instance-groups/configuring-stateful-ip-addresses-in-migs | 
list(object({
    interface_name = string
    delete_rule    = string
    is_external    = bool
  }))
| `[]` | no | diff --git a/modules/mig_with_percent/metadata.yaml b/modules/mig_with_percent/metadata.yaml index 08f5f2d9..439a05c1 100644 --- a/modules/mig_with_percent/metadata.yaml +++ b/modules/mig_with_percent/metadata.yaml @@ -81,7 +81,7 @@ spec: interfaces: variables: - name: project_id - description: The GCP project ID + description: The Google Cloud project ID varType: string - name: hostname description: Hostname prefix for instances @@ -92,7 +92,7 @@ spec: varType: string defaultValue: "" - name: region - description: The GCP region where the managed instance group resides. + description: The Google Cloud region where the managed instance group resides. varType: string required: true - name: instance_template_initial_version diff --git a/modules/mig_with_percent/variables.tf b/modules/mig_with_percent/variables.tf index 40af6859..c73e514b 100644 --- a/modules/mig_with_percent/variables.tf +++ b/modules/mig_with_percent/variables.tf @@ -18,7 +18,7 @@ variable "project_id" { type = string - description = "The GCP project ID" + description = "The Google Cloud project ID" default = null } @@ -35,7 +35,7 @@ variable "mig_name" { } variable "region" { - description = "The GCP region where the managed instance group resides." + description = "The Google Cloud region where the managed instance group resides." type = string }