Skip to content

Commit

Permalink
use E2 VMs (#4081) (#7514)
Browse files Browse the repository at this point in the history 
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
@modular-magician
modular-magician authored Oct 13, 2020
1 parent 6fa8a51 commit d6e2454
Show file tree
Hide file tree
Showing 6 changed files with 129 additions and 126 deletions.
3 changes: 3 additions & 0 deletions .changelog/4081.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
14 changes: 7 additions & 7 deletions google/resource_compute_backend_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ resource "google_compute_instance_group_manager" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
network_interface {
network = "default"
Expand Down Expand Up @@ -826,7 +826,7 @@ resource "google_compute_instance_group_manager" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
network_interface {
network = "default"
Expand Down Expand Up @@ -1001,7 +1001,7 @@ resource "google_compute_instance_group_manager" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
network_interface {
network = "default"
Expand Down Expand Up @@ -1058,7 +1058,7 @@ resource "google_compute_instance_group_manager" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
network_interface {
network = "default"
Expand Down Expand Up @@ -1105,7 +1105,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance" "endpoint-instance" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
boot_disk {
initialize_params {
Expand Down Expand Up @@ -1183,7 +1183,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance" "endpoint-instance" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
boot_disk {
initialize_params {
Expand Down Expand Up @@ -1340,7 +1340,7 @@ resource "google_compute_instance_group_manager" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "instance-template-internal"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
network_interface {
network = "default"
Expand Down
2 changes: 1 addition & 1 deletion google/resource_compute_disk_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ resource "google_compute_disk" "foo" {
resource "google_compute_instance" "bar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
zone = "us-central1-a"
boot_disk {
Expand Down
14 changes: 7 additions & 7 deletions google/resource_compute_instance_from_template_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ resource "google_compute_disk" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "n1-standard-1" // can't be e2 because of local-ssd
disk {
source = google_compute_disk.foobar.name
Expand Down Expand Up @@ -334,7 +334,7 @@ resource "google_compute_disk" "override_disk" {
resource "google_compute_instance_template" "template" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -399,7 +399,7 @@ resource "google_compute_disk" "override_disk" {
resource "google_compute_instance_template" "template" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -464,7 +464,7 @@ resource "google_compute_disk" "override_disk" {
resource "google_compute_instance_template" "template" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "n1-standard-1" // can't be e2 because of local-ssd
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -518,7 +518,7 @@ resource "google_compute_disk" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source = google_compute_disk.foobar.name
Expand Down Expand Up @@ -561,7 +561,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -638,7 +638,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down
50 changes: 25 additions & 25 deletions google/resource_compute_instance_template_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
tags = ["foo", "bar"]
Expand Down Expand Up @@ -1278,7 +1278,7 @@ resource "google_compute_image" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
tags = ["foo", "bar"]
Expand Down Expand Up @@ -1321,7 +1321,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
tags = ["foo", "bar"]
Expand Down Expand Up @@ -1364,7 +1364,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
tags = ["foo", "bar"]
disk {
Expand Down Expand Up @@ -1394,7 +1394,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand All @@ -1419,7 +1419,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
tags = ["foo", "bar"]
disk {
Expand Down Expand Up @@ -1447,7 +1447,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
tags = ["foo", "bar"]
disk {
Expand Down Expand Up @@ -1483,7 +1483,7 @@ resource "google_compute_disk" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1529,7 +1529,7 @@ resource "google_compute_disk" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1564,7 +1564,7 @@ data "google_compute_image" "my_image" {
}
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
disk {
source_image = data.google_compute_image.my_image.name
Expand Down Expand Up @@ -1601,7 +1601,7 @@ resource "google_compute_region_disk" "foobar" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1641,7 +1641,7 @@ resource "google_compute_network" "auto-network" {
resource "google_compute_instance_template" "foobar" {
name = "instance-tpl-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1682,7 +1682,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instance-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
region = "us-central1"
disk {
Expand Down Expand Up @@ -1759,7 +1759,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instance-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
region = "us-central1"
disk {
Expand Down Expand Up @@ -1791,7 +1791,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instance-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1822,7 +1822,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instance-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1869,7 +1869,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instance-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1908,7 +1908,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instance-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1943,7 +1943,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instance-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -1975,7 +1975,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
disk {
Expand Down Expand Up @@ -2009,7 +2009,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-4"
machine_type = "e2-standard-4"
disk {
source_image = data.google_compute_image.my_image.self_link
Expand Down Expand Up @@ -2048,7 +2048,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
disk {
Expand Down Expand Up @@ -2079,7 +2079,7 @@ data "google_compute_image" "my_image" {
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
disk {
source_image = data.google_compute_image.my_image.self_link
Expand All @@ -2104,7 +2104,7 @@ func testAccComputeInstanceTemplate_invalidDiskType(suffix string) string {
# }
resource "google_compute_instance_template" "foobar" {
name = "instancet-test-%s"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
can_ip_forward = false
disk {
source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
Expand Down Expand Up @@ -2148,7 +2148,7 @@ resource "google_compute_image" "diskimage" {
}
resource "google_compute_instance_template" "foobar" {
name_prefix = "tf-test-instance-"
machine_type = "n1-standard-1"
machine_type = "e2-medium"
disk {
source_image = google_compute_image.diskimage.self_link
}
Expand Down
Loading

0 comments on commit d6e2454

Please sign in to comment.