Skip to content
Open
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added .terraform.lock
Empty file.
2 changes: 1 addition & 1 deletion examples/compute_instance/disk_snapshot/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module "instance_template" {

module "compute_instance" {
source = "terraform-google-modules/vm/google//modules/compute_instance"
version = "~> 13.0"
version = "~> 14.0"

project_id = var.project_id
region = var.region
Expand Down
2 changes: 1 addition & 1 deletion examples/compute_instance/simple/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module "instance_template" {

module "compute_instance" {
source = "terraform-google-modules/vm/google//modules/compute_instance"
version = "~> 13.0"
version = "~> 14.0"

project_id = var.project_id
region = var.region
Expand Down
2 changes: 1 addition & 1 deletion examples/confidential_computing/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ module "instance_template" {

module "compute_instance" {
source = "terraform-google-modules/vm/google//modules/compute_instance"
version = "~> 13.0"
version = "~> 14.0"

project_id = var.project_id
region = var.region
Expand Down
5 changes: 3 additions & 2 deletions examples/confidential_computing_intel/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ 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 = "~> 13.0"

region = var.region
project_id = var.project_id
Expand All @@ -89,7 +90,7 @@ module "instance_template" {

module "compute_instance" {
source = "terraform-google-modules/vm/google//modules/compute_instance"
version = "~> 13.0"
version = "~> 14.0"

project_id = var.project_id
region = var.region
Expand Down
18 changes: 15 additions & 3 deletions modules/compute_instance/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,32 @@ spec:
description: Network to deploy to. Only one of network or subnetwork should be specified.
varType: string
defaultValue: ""
connections:
- source:
source: github.com/terraform-google-modules/terraform-google-network
version: ~> 18.0.0
spec:
outputExpr: network_name
- name: subnetwork
description: Subnet to deploy to. Only one of network or subnetwork should be specified.
varType: string
defaultValue: ""
connections:
- source:
source: github.com/terraform-google-modules/terraform-google-network//modules/subnets
version: ~> 6.0
source: github.com/terraform-google-modules/terraform-google-network
version: ~> 18.0.0
Comment thread
krprabhat-eng marked this conversation as resolved.
spec:
outputExpr: subnets[0].self_link
outputExpr: subnets_self_links[0]
- name: subnetwork_project
description: The project that subnetwork belongs to
varType: string
defaultValue: ""
connections:
- source:
source: github.com/terraform-google-modules/terraform-google-network
version: ~> 18.0.0
spec:
outputExpr: project_id
- name: hostname
description: Hostname of instances
varType: string
Expand Down
95 changes: 42 additions & 53 deletions modules/mig/metadata.display.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ spec:
name: autoscaling_cpu
Comment thread
zubitripathy marked this conversation as resolved.
title: Autoscaling Cpu
properties:
target:
name: target
title: Target
min: 0.0
max: 1.0
predictive_method:
name: predictive_method
title: Predictive Method
Expand All @@ -50,6 +45,10 @@ spec:
value: NONE
- label: OPTIMIZE_AVAILABILITY
value: OPTIMIZE_AVAILABILITY
target:
name: target
title: Target
max: 1
autoscaling_enabled:
name: autoscaling_enabled
title: Autoscaling Enabled
Expand All @@ -60,17 +59,15 @@ spec:
target:
name: target
title: Target
min: 0.0
max: 1.0
max: 1
autoscaling_metric:
name: autoscaling_metric
title: Autoscaling Metric
properties:
target:
name: target
title: Target
min: 0.0
max: 1.0
max: 1
type:
name: type
title: Type
Expand Down Expand Up @@ -99,16 +96,13 @@ spec:
fixed_replicas:
name: fixed_replicas
title: Fixed Replicas
min: 0
percent_replicas:
name: percent_replicas
title: Percent Replicas
min: 0
max: 100
cooldown_period:
name: cooldown_period
title: Cooldown Period
min: 0
distribution_policy_target_shape:
name: distribution_policy_target_shape
title: Distribution Policy Target Shape
Expand All @@ -128,23 +122,15 @@ spec:
name: health_check
title: Health Check
properties:
type:
name: type
title: Type
enumValueLabels:
- label: HTTPS
value: HTTPS
- label: HTTP
value: HTTP
- label: TCP
value: TCP
- label: SSL
value: SSL
initial_delay_sec:
name: initial_delay_sec
title: Initial Delay Sec
min: 0
max: 3600
port:
name: port
title: Port
min: 1
max: 65535
proxy_header:
name: proxy_header
title: Proxy Header
Expand All @@ -153,11 +139,18 @@ spec:
value: NONE
- label: PROXY_V1
value: PROXY_V1
port:
name: port
title: Port
min: 1
max: 65535
type:
name: type
title: Type
enumValueLabels:
- label: HTTPS
value: HTTPS
- label: HTTP
value: HTTP
- label: TCP
value: TCP
- label: SSL
value: SSL
health_check_name:
name: health_check_name
title: Health Check Name
Expand All @@ -166,13 +159,13 @@ spec:
hostname:
name: hostname
title: Hostname
level: 1
regexValidation: ^[a-z][a-z0-9-]{0,61}[a-z0-9]$
validation: Hostname must be between 1 and 63 characters long, start with a lowercase letter, and can contain lowercase letters, numbers, and hyphens.
level: 1
instance_template:
name: instance_template
title: Instance Template
regexValidation: "^https://www.googleapis.com/compute/v1/projects/[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?/(?:global|regions/[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)/instanceTemplates/[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?$"
regexValidation: ^https://www.googleapis.com/compute/v1/projects/[a-z0-9](?:[-a-z0-9]{0,61}[a-z0-9])?/(?:global|regions/[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)/instanceTemplates/[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?$
validation: Invalid template url format, valid format is either https://www.googleapis.com/compute/v1/projects/{project}/regions/{region}/instanceTemplates/{template_name} (regional) or https://www.googleapis.com/compute/v1/projects/{project}/global/instanceTemplates/{template_name} (global).
labels:
name: labels
Expand Down Expand Up @@ -226,7 +219,7 @@ spec:
schedule:
name: schedule
title: Schedule
regexValidation: "^([*]|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])(-([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9]))?)(,([*]|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])(-([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9]))?))* ([*]|([0-9]|1[0-9]|2[0-3])(-([0-9]|1[0-9]|2[0-3]))?)(,([*]|([0-9]|1[0-9]|2[0-3])(-([0-9]|1[0-9]|2[0-3]))?))* ([*]|([1-9]|1[0-9]|2[0-9]|3[0-1])(-([1-9]|1[0-9]|2[0-9]|3[0-1]))?)(,([*]|([1-9]|1[0-9]|2[0-9]|3[0-1])(-([1-9]|1[0-9]|2[0-9]|3[0-1]))?))* ([*]|([1-9]|1[0-2])(-([1-9]|1[0-2]))?)(,([*]|([1-9]|1[0-2])(-([1-9]|1[0-2]))?))* ([*]|([0-6])(-([0-6]))?)(,([*]|([0-6])(-([0-6]))?))*$"
regexValidation: ^([*]|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])(-([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9]))?)(,([*]|([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9])(-([0-9]|1[0-9]|2[0-9]|3[0-9]|4[0-9]|5[0-9]))?))* ([*]|([0-9]|1[0-9]|2[0-3])(-([0-9]|1[0-9]|2[0-3]))?)(,([*]|([0-9]|1[0-9]|2[0-3])(-([0-9]|1[0-9]|2[0-3]))?))* ([*]|([1-9]|1[0-9]|2[0-9]|3[0-1])(-([1-9]|1[0-9]|2[0-9]|3[0-1]))?)(,([*]|([1-9]|1[0-9]|2[0-9]|3[0-1])(-([1-9]|1[0-9]|2[0-9]|3[0-1]))?))* ([*]|([1-9]|1[0-2])(-([1-9]|1[0-2]))?)(,([*]|([1-9]|1[0-2])(-([1-9]|1[0-2]))?))* ([*]|([0-6])(-([0-6]))?)(,([*]|([0-6])(-([0-6]))?))*$
validation: Schedule must be in cron format.
stateful_disks:
name: stateful_disks
Expand Down Expand Up @@ -258,7 +251,6 @@ spec:
target_size:
name: target_size
title: Target Size
min: 0
level: 1
update_policy:
name: update_policy
Expand All @@ -275,26 +267,15 @@ spec:
max_surge_percent:
name: max_surge_percent
title: Max Surge Percent
min: 0
max: 100
max_unavailable_percent:
name: max_unavailable_percent
title: Max Unavailable Percent
min: 0
max: 100
min_ready_sec:
name: min_ready_sec
title: Min Ready Sec
min: 0
max: 3600
replacement_method:
name: replacement_method
title: Replacement Method
enumValueLabels:
- label: RECREATE
value: RECREATE
- label: SUBSTITUTE
value: SUBSTITUTE
minimal_action:
name: minimal_action
title: Minimal Action
Expand All @@ -307,14 +288,6 @@ spec:
value: REFRESH
- label: NONE
value: NONE
type:
name: type
title: Type
enumValueLabels:
- label: PROACTIVE
value: PROACTIVE
- label: OPPORTUNISTIC
value: OPPORTUNISTIC
most_disruptive_allowed_action:
name: most_disruptive_allowed_action
title: Most Disruptive Allowed Action
Expand All @@ -327,6 +300,22 @@ spec:
value: REFRESH
- label: NONE
value: NONE
replacement_method:
name: replacement_method
title: Replacement Method
enumValueLabels:
- label: RECREATE
value: RECREATE
- label: SUBSTITUTE
value: SUBSTITUTE
type:
name: type
title: Type
enumValueLabels:
- label: PROACTIVE
value: PROACTIVE
- label: OPPORTUNISTIC
value: OPPORTUNISTIC
wait_for_instances:
name: wait_for_instances
title: Wait For Instances