diff --git a/modules/compute-vm/README.md b/modules/compute-vm/README.md index dfb69663a..e13553c18 100644 --- a/modules/compute-vm/README.md +++ b/modules/compute-vm/README.md @@ -1188,7 +1188,7 @@ module "sole-tenancy" { | [hostname](variables.tf#L238) | Instance FQDN name. | string | | null | | [iam](variables.tf#L244) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | | [instance_schedule](variables.tf#L250) | Assign or create and assign an instance schedule policy. Either resource policy id or create_config must be specified if not null. Set active to null to dtach a policy from vm before destroying. | object({…}) | | null | -| [instance_type](variables.tf#L274) | Instance type. | string | | "f1-micro" | +| [instance_type](variables.tf#L274) | Instance type. | string | | "e2-micro" | | [kms_autokeys](variables.tf#L280) | KMS Autokey key handles. If location is not specified it will be inferred from the zone. Key handle names will be added to the kms_keys context with an `autokeys/` prefix. | map(object({…})) | | {} | | [labels](variables.tf#L298) | Instance labels. | map(string) | | {} | | [metadata](variables.tf#L304) | Instance metadata. | map(string) | | {} | diff --git a/modules/compute-vm/variables.tf b/modules/compute-vm/variables.tf index ddbe31c7f..b701af052 100644 --- a/modules/compute-vm/variables.tf +++ b/modules/compute-vm/variables.tf @@ -274,7 +274,7 @@ variable "instance_schedule" { variable "instance_type" { description = "Instance type." type = string - default = "f1-micro" + default = "e2-micro" } variable "kms_autokeys" { diff --git a/tests/modules/compute_mig/examples/flexible.yaml b/tests/modules/compute_mig/examples/flexible.yaml index da68e081a..9033dc501 100644 --- a/tests/modules/compute_mig/examples/flexible.yaml +++ b/tests/modules/compute_mig/examples/flexible.yaml @@ -74,7 +74,7 @@ values: instance_description: null key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: user-data: "#cloud-config\n\n# Copyright 2023 Google LLC\n#\n# Licensed under\ \ the Apache License, Version 2.0 (the \"License\");\n# you may not use this\ diff --git a/tests/modules/compute_vm/context-template-regional.yaml b/tests/modules/compute_vm/context-template-regional.yaml index f3845f1a4..0204429ba 100644 --- a/tests/modules/compute_vm/context-template-regional.yaml +++ b/tests/modules/compute_vm/context-template-regional.yaml @@ -68,7 +68,7 @@ values: instance_description: null key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null min_cpu_platform: null diff --git a/tests/modules/compute_vm/context-template.yaml b/tests/modules/compute_vm/context-template.yaml index 64ffc92ca..e3b1d5553 100644 --- a/tests/modules/compute_vm/context-template.yaml +++ b/tests/modules/compute_vm/context-template.yaml @@ -68,7 +68,7 @@ values: instance_description: null key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null min_cpu_platform: null diff --git a/tests/modules/compute_vm/context-vm.yaml b/tests/modules/compute_vm/context-vm.yaml index 5412afae4..1656963d8 100644 --- a/tests/modules/compute_vm/context-vm.yaml +++ b/tests/modules/compute_vm/context-vm.yaml @@ -90,7 +90,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test diff --git a/tests/modules/compute_vm/examples/defaults.yaml b/tests/modules/compute_vm/examples/defaults.yaml index 17a8904d7..48bdb4767 100644 --- a/tests/modules/compute_vm/examples/defaults.yaml +++ b/tests/modules/compute_vm/examples/defaults.yaml @@ -33,7 +33,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test diff --git a/tests/modules/compute_vm/examples/disks-example-template.yaml b/tests/modules/compute_vm/examples/disks-example-template.yaml index 2d931c15b..75a2e8a70 100644 --- a/tests/modules/compute_vm/examples/disks-example-template.yaml +++ b/tests/modules/compute_vm/examples/disks-example-template.yaml @@ -54,7 +54,7 @@ values: instance_description: null key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null min_cpu_platform: null diff --git a/tests/modules/compute_vm/examples/independent-boot-disk.yaml b/tests/modules/compute_vm/examples/independent-boot-disk.yaml index 735e51709..50aa91072 100644 --- a/tests/modules/compute_vm/examples/independent-boot-disk.yaml +++ b/tests/modules/compute_vm/examples/independent-boot-disk.yaml @@ -44,7 +44,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test diff --git a/tests/modules/compute_vm/examples/sa-custom.yaml b/tests/modules/compute_vm/examples/sa-custom.yaml index 5a63e821b..540f91527 100644 --- a/tests/modules/compute_vm/examples/sa-custom.yaml +++ b/tests/modules/compute_vm/examples/sa-custom.yaml @@ -33,7 +33,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test2 diff --git a/tests/modules/compute_vm/examples/sa-default.yaml b/tests/modules/compute_vm/examples/sa-default.yaml index 0a0d85c37..d8d9562a6 100644 --- a/tests/modules/compute_vm/examples/sa-default.yaml +++ b/tests/modules/compute_vm/examples/sa-default.yaml @@ -33,7 +33,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test1 diff --git a/tests/modules/compute_vm/examples/sa-managed.yaml b/tests/modules/compute_vm/examples/sa-managed.yaml index 2242291c5..1d3025869 100644 --- a/tests/modules/compute_vm/examples/sa-managed.yaml +++ b/tests/modules/compute_vm/examples/sa-managed.yaml @@ -33,7 +33,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test2 diff --git a/tests/modules/compute_vm/examples/sa-none.yaml b/tests/modules/compute_vm/examples/sa-none.yaml index 5294db930..075afee3a 100644 --- a/tests/modules/compute_vm/examples/sa-none.yaml +++ b/tests/modules/compute_vm/examples/sa-none.yaml @@ -33,7 +33,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test2 diff --git a/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml b/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml index 1ea524c89..f710f087b 100644 --- a/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml +++ b/tests/modules/compute_vm/examples/snapshot-schedule-create.yaml @@ -57,7 +57,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: schedule-test diff --git a/tests/modules/compute_vm/examples/tag-bindings.yaml b/tests/modules/compute_vm/examples/tag-bindings.yaml index 593154145..4f5b848b7 100644 --- a/tests/modules/compute_vm/examples/tag-bindings.yaml +++ b/tests/modules/compute_vm/examples/tag-bindings.yaml @@ -34,7 +34,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: test diff --git a/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml b/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml index 385ba8aba..dc508584d 100644 --- a/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml +++ b/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml @@ -59,7 +59,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-b @@ -145,7 +145,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-c diff --git a/tests/modules/net_lb_app_ext/examples/tls-settings.yaml b/tests/modules/net_lb_app_ext/examples/tls-settings.yaml index 86018ea12..0baa792cb 100644 --- a/tests/modules/net_lb_app_ext/examples/tls-settings.yaml +++ b/tests/modules/net_lb_app_ext/examples/tls-settings.yaml @@ -45,7 +45,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-b @@ -132,7 +132,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-c diff --git a/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml b/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml index 9d66af5de..88d3a1265 100644 --- a/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml +++ b/tests/modules/net_lb_app_ext_regional/examples/tls-settings.yaml @@ -45,7 +45,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-b @@ -132,7 +132,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-c diff --git a/tests/modules/net_lb_ext/examples/dual_stack.yaml b/tests/modules/net_lb_ext/examples/dual_stack.yaml index 55e6f5b25..fa1ec39cd 100644 --- a/tests/modules/net_lb_ext/examples/dual_stack.yaml +++ b/tests/modules/net_lb_ext/examples/dual_stack.yaml @@ -37,7 +37,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-b @@ -111,7 +111,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-c diff --git a/tests/modules/net_lb_ext/examples/e2e.yaml b/tests/modules/net_lb_ext/examples/e2e.yaml index ecbc57bef..84aae6fb2 100644 --- a/tests/modules/net_lb_ext/examples/e2e.yaml +++ b/tests/modules/net_lb_ext/examples/e2e.yaml @@ -37,7 +37,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: user-data: "#cloud-config\n\n# Copyright 2023 Google LLC\n#\n# Licensed under\ \ the Apache License, Version 2.0 (the \"License\");\n# you may not use this\ @@ -137,7 +137,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: user-data: "#cloud-config\n\n# Copyright 2023 Google LLC\n#\n# Licensed under\ \ the Apache License, Version 2.0 (the \"License\");\n# you may not use this\ diff --git a/tests/modules/net_lb_ext/examples/ext_migs.yaml b/tests/modules/net_lb_ext/examples/ext_migs.yaml index 80bde70c2..06aed1cc4 100644 --- a/tests/modules/net_lb_ext/examples/ext_migs.yaml +++ b/tests/modules/net_lb_ext/examples/ext_migs.yaml @@ -37,7 +37,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-b @@ -111,7 +111,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-c diff --git a/tests/modules/net_lb_ext/examples/fwd_rules.yaml b/tests/modules/net_lb_ext/examples/fwd_rules.yaml index 1f1934130..c7de646a9 100644 --- a/tests/modules/net_lb_ext/examples/fwd_rules.yaml +++ b/tests/modules/net_lb_ext/examples/fwd_rules.yaml @@ -37,7 +37,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-b @@ -111,7 +111,7 @@ values: enable_display: false hostname: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-ig-c diff --git a/tests/modules/net_lb_ext/examples/migs.yaml b/tests/modules/net_lb_ext/examples/migs.yaml index 5e1f7232c..a39c4a8ce 100644 --- a/tests/modules/net_lb_ext/examples/migs.yaml +++ b/tests/modules/net_lb_ext/examples/migs.yaml @@ -38,7 +38,7 @@ values: guest_accelerator: [] instance_description: null labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null min_cpu_platform: null diff --git a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml index 6b43e66df..20ace6358 100644 --- a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml +++ b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel-custom-ciphers.yaml @@ -45,7 +45,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-vm diff --git a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml index 0b4502ba4..a0a5f26aa 100644 --- a/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml +++ b/tests/modules/net_vpn_dynamic/examples/vpn-single-tunnel.yaml @@ -45,7 +45,7 @@ values: instance_encryption_key: [] key_revocation_action_type: NONE labels: null - machine_type: f1-micro + machine_type: e2-micro metadata: null metadata_startup_script: null name: my-vm