Skip to content

Commit b13ea50

Browse files
modular-magicianmodular-magician
authored
use E2 VMs (#4081) (#2589)
Signed-off-by: Modular Magician <[email protected]>
1 parent 4504494 commit b13ea50

7 files changed

+131
-128
lines changed

‎.changelog/4081.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google-beta/resource_compute_backend_service_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ resource "google_compute_instance_group_manager" "foobar" {
907907
908908
resource "google_compute_instance_template" "foobar" {
909909
name = "%s"
910-
machine_type = "n1-standard-1"
910+
machine_type = "e2-medium"
911911
912912
network_interface {
913913
network = "default"
@@ -969,7 +969,7 @@ resource "google_compute_instance_group_manager" "foobar" {
969969
970970
resource "google_compute_instance_template" "foobar" {
971971
name = "%s"
972-
machine_type = "n1-standard-1"
972+
machine_type = "e2-medium"
973973
974974
network_interface {
975975
network = "default"
@@ -1144,7 +1144,7 @@ resource "google_compute_instance_group_manager" "foobar" {
11441144
11451145
resource "google_compute_instance_template" "foobar" {
11461146
name = "%s"
1147-
machine_type = "n1-standard-1"
1147+
machine_type = "e2-medium"
11481148
11491149
network_interface {
11501150
network = "default"
@@ -1201,7 +1201,7 @@ resource "google_compute_instance_group_manager" "foobar" {
12011201
12021202
resource "google_compute_instance_template" "foobar" {
12031203
name = "%s"
1204-
machine_type = "n1-standard-1"
1204+
machine_type = "e2-medium"
12051205
12061206
network_interface {
12071207
network = "default"
@@ -1248,7 +1248,7 @@ data "google_compute_image" "my_image" {
12481248
12491249
resource "google_compute_instance" "endpoint-instance" {
12501250
name = "%s"
1251-
machine_type = "n1-standard-1"
1251+
machine_type = "e2-medium"
12521252
12531253
boot_disk {
12541254
initialize_params {
@@ -1326,7 +1326,7 @@ data "google_compute_image" "my_image" {
13261326
13271327
resource "google_compute_instance" "endpoint-instance" {
13281328
name = "%s"
1329-
machine_type = "n1-standard-1"
1329+
machine_type = "e2-medium"
13301330
13311331
boot_disk {
13321332
initialize_params {
@@ -1483,7 +1483,7 @@ resource "google_compute_instance_group_manager" "foobar" {
14831483
14841484
resource "google_compute_instance_template" "foobar" {
14851485
name = "instance-template-internal"
1486-
machine_type = "n1-standard-1"
1486+
machine_type = "e2-medium"
14871487
14881488
network_interface {
14891489
network = "default"

‎google-beta/resource_compute_disk_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ resource "google_compute_disk" "foo" {
664664
665665
resource "google_compute_instance" "bar" {
666666
name = "%s"
667-
machine_type = "n1-standard-1"
667+
machine_type = "e2-medium"
668668
zone = "us-central1-a"
669669
670670
boot_disk {

‎google-beta/resource_compute_global_forwarding_rule_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ resource "google_compute_instance_group_manager" "igm" {
461461
462462
resource "google_compute_instance_template" "instance_template" {
463463
name = "%s"
464-
machine_type = "n1-standard-1"
464+
machine_type = "e2-medium"
465465
466466
network_interface {
467467
network = "default"
@@ -580,7 +580,7 @@ resource "google_compute_instance_group_manager" "igm" {
580580
581581
resource "google_compute_instance_template" "instance_template" {
582582
name = "%s"
583-
machine_type = "n1-standard-1"
583+
machine_type = "e2-medium"
584584
585585
network_interface {
586586
network = "default"

‎google-beta/resource_compute_instance_from_template_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ resource "google_compute_disk" "foobar" {
252252
253253
resource "google_compute_instance_template" "foobar" {
254254
name = "%s"
255-
machine_type = "n1-standard-1"
255+
machine_type = "n1-standard-1" // can't be e2 because of local-ssd
256256
257257
disk {
258258
source = google_compute_disk.foobar.name
@@ -334,7 +334,7 @@ resource "google_compute_disk" "override_disk" {
334334
335335
resource "google_compute_instance_template" "template" {
336336
name = "%s"
337-
machine_type = "n1-standard-1"
337+
machine_type = "e2-medium"
338338
339339
disk {
340340
source_image = data.google_compute_image.my_image.self_link
@@ -399,7 +399,7 @@ resource "google_compute_disk" "override_disk" {
399399
400400
resource "google_compute_instance_template" "template" {
401401
name = "%s"
402-
machine_type = "n1-standard-1"
402+
machine_type = "e2-medium"
403403
404404
disk {
405405
source_image = data.google_compute_image.my_image.self_link
@@ -464,7 +464,7 @@ resource "google_compute_disk" "override_disk" {
464464
465465
resource "google_compute_instance_template" "template" {
466466
name = "%s"
467-
machine_type = "n1-standard-1"
467+
machine_type = "n1-standard-1" // can't be e2 because of local-ssd
468468
469469
disk {
470470
source_image = data.google_compute_image.my_image.self_link
@@ -518,7 +518,7 @@ resource "google_compute_disk" "foobar" {
518518
519519
resource "google_compute_instance_template" "foobar" {
520520
name = "%s"
521-
machine_type = "n1-standard-1"
521+
machine_type = "e2-medium"
522522
523523
disk {
524524
source = google_compute_disk.foobar.name
@@ -561,7 +561,7 @@ data "google_compute_image" "my_image" {
561561
562562
resource "google_compute_instance_template" "foobar" {
563563
name = "%s"
564-
machine_type = "n1-standard-1"
564+
machine_type = "e2-medium"
565565
566566
disk {
567567
source_image = data.google_compute_image.my_image.self_link
@@ -638,7 +638,7 @@ data "google_compute_image" "my_image" {
638638
639639
resource "google_compute_instance_template" "foobar" {
640640
name = "%s"
641-
machine_type = "n1-standard-1"
641+
machine_type = "e2-medium"
642642
643643
disk {
644644
source_image = data.google_compute_image.my_image.self_link

‎google-beta/resource_compute_instance_template_test.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ data "google_compute_image" "my_image" {
12561256
12571257
resource "google_compute_instance_template" "foobar" {
12581258
name = "instancet-test-%s"
1259-
machine_type = "n1-standard-1"
1259+
machine_type = "e2-medium"
12601260
can_ip_forward = false
12611261
tags = ["foo", "bar"]
12621262
@@ -1310,7 +1310,7 @@ resource "google_compute_image" "foobar" {
13101310
13111311
resource "google_compute_instance_template" "foobar" {
13121312
name = "instancet-test-%s"
1313-
machine_type = "n1-standard-1"
1313+
machine_type = "e2-medium"
13141314
can_ip_forward = false
13151315
tags = ["foo", "bar"]
13161316
@@ -1353,7 +1353,7 @@ data "google_compute_image" "my_image" {
13531353
13541354
resource "google_compute_instance_template" "foobar" {
13551355
name = "instancet-test-%s"
1356-
machine_type = "n1-standard-1"
1356+
machine_type = "e2-medium"
13571357
can_ip_forward = false
13581358
tags = ["foo", "bar"]
13591359
@@ -1396,7 +1396,7 @@ data "google_compute_image" "my_image" {
13961396
13971397
resource "google_compute_instance_template" "foobar" {
13981398
name = "instancet-test-%s"
1399-
machine_type = "n1-standard-1"
1399+
machine_type = "e2-medium"
14001400
tags = ["foo", "bar"]
14011401
14021402
disk {
@@ -1426,7 +1426,7 @@ data "google_compute_image" "my_image" {
14261426
14271427
resource "google_compute_instance_template" "foobar" {
14281428
name = "instancet-test-%s"
1429-
machine_type = "n1-standard-1"
1429+
machine_type = "e2-medium"
14301430
14311431
disk {
14321432
source_image = data.google_compute_image.my_image.self_link
@@ -1451,7 +1451,7 @@ data "google_compute_image" "my_image" {
14511451
14521452
resource "google_compute_instance_template" "foobar" {
14531453
name = "instancet-test-%s"
1454-
machine_type = "n1-standard-1"
1454+
machine_type = "e2-medium"
14551455
tags = ["foo", "bar"]
14561456
14571457
disk {
@@ -1479,7 +1479,7 @@ data "google_compute_image" "my_image" {
14791479
14801480
resource "google_compute_instance_template" "foobar" {
14811481
name = "instancet-test-%s"
1482-
machine_type = "n1-standard-1"
1482+
machine_type = "e2-medium"
14831483
tags = ["foo", "bar"]
14841484
14851485
disk {
@@ -1515,7 +1515,7 @@ resource "google_compute_disk" "foobar" {
15151515
15161516
resource "google_compute_instance_template" "foobar" {
15171517
name = "instancet-test-%s"
1518-
machine_type = "n1-standard-1"
1518+
machine_type = "e2-medium"
15191519
15201520
disk {
15211521
source_image = data.google_compute_image.my_image.self_link
@@ -1561,7 +1561,7 @@ resource "google_compute_disk" "foobar" {
15611561
15621562
resource "google_compute_instance_template" "foobar" {
15631563
name = "instancet-test-%s"
1564-
machine_type = "n1-standard-1"
1564+
machine_type = "e2-medium"
15651565
15661566
disk {
15671567
source_image = data.google_compute_image.my_image.self_link
@@ -1596,7 +1596,7 @@ data "google_compute_image" "my_image" {
15961596
}
15971597
resource "google_compute_instance_template" "foobar" {
15981598
name = "instancet-test-%s"
1599-
machine_type = "n1-standard-1"
1599+
machine_type = "e2-medium"
16001600
can_ip_forward = false
16011601
disk {
16021602
source_image = data.google_compute_image.my_image.name
@@ -1633,7 +1633,7 @@ resource "google_compute_region_disk" "foobar" {
16331633
16341634
resource "google_compute_instance_template" "foobar" {
16351635
name = "instancet-test-%s"
1636-
machine_type = "n1-standard-1"
1636+
machine_type = "e2-medium"
16371637
16381638
disk {
16391639
source_image = data.google_compute_image.my_image.self_link
@@ -1673,7 +1673,7 @@ resource "google_compute_network" "auto-network" {
16731673
16741674
resource "google_compute_instance_template" "foobar" {
16751675
name = "instance-tpl-%s"
1676-
machine_type = "n1-standard-1"
1676+
machine_type = "e2-medium"
16771677
16781678
disk {
16791679
source_image = data.google_compute_image.my_image.self_link
@@ -1714,7 +1714,7 @@ data "google_compute_image" "my_image" {
17141714
17151715
resource "google_compute_instance_template" "foobar" {
17161716
name = "instance-test-%s"
1717-
machine_type = "n1-standard-1"
1717+
machine_type = "e2-medium"
17181718
region = "us-central1"
17191719
17201720
disk {
@@ -1791,7 +1791,7 @@ data "google_compute_image" "my_image" {
17911791
17921792
resource "google_compute_instance_template" "foobar" {
17931793
name = "instance-test-%s"
1794-
machine_type = "n1-standard-1"
1794+
machine_type = "e2-medium"
17951795
region = "us-central1"
17961796
17971797
disk {
@@ -1823,7 +1823,7 @@ data "google_compute_image" "my_image" {
18231823
18241824
resource "google_compute_instance_template" "foobar" {
18251825
name = "instance-test-%s"
1826-
machine_type = "n1-standard-1"
1826+
machine_type = "e2-medium"
18271827
18281828
disk {
18291829
source_image = data.google_compute_image.my_image.self_link
@@ -1854,7 +1854,7 @@ data "google_compute_image" "my_image" {
18541854
18551855
resource "google_compute_instance_template" "foobar" {
18561856
name = "instance-test-%s"
1857-
machine_type = "n1-standard-1"
1857+
machine_type = "e2-medium"
18581858
18591859
disk {
18601860
source_image = data.google_compute_image.my_image.self_link
@@ -1901,7 +1901,7 @@ data "google_compute_image" "my_image" {
19011901
19021902
resource "google_compute_instance_template" "foobar" {
19031903
name = "instance-test-%s"
1904-
machine_type = "n1-standard-1"
1904+
machine_type = "e2-medium"
19051905
19061906
disk {
19071907
source_image = data.google_compute_image.my_image.self_link
@@ -1940,7 +1940,7 @@ data "google_compute_image" "my_image" {
19401940
19411941
resource "google_compute_instance_template" "foobar" {
19421942
name = "instance-test-%s"
1943-
machine_type = "n1-standard-1"
1943+
machine_type = "e2-medium"
19441944
19451945
disk {
19461946
source_image = data.google_compute_image.my_image.self_link
@@ -1975,7 +1975,7 @@ data "google_compute_image" "my_image" {
19751975
19761976
resource "google_compute_instance_template" "foobar" {
19771977
name = "instance-test-%s"
1978-
machine_type = "n1-standard-1"
1978+
machine_type = "e2-medium"
19791979
19801980
disk {
19811981
source_image = data.google_compute_image.my_image.self_link
@@ -2007,7 +2007,7 @@ data "google_compute_image" "my_image" {
20072007
20082008
resource "google_compute_instance_template" "foobar" {
20092009
name = "instancet-test-%s"
2010-
machine_type = "n1-standard-1"
2010+
machine_type = "e2-medium"
20112011
can_ip_forward = false
20122012
20132013
disk {
@@ -2041,7 +2041,7 @@ data "google_compute_image" "my_image" {
20412041
20422042
resource "google_compute_instance_template" "foobar" {
20432043
name = "instancet-test-%s"
2044-
machine_type = "n1-standard-4"
2044+
machine_type = "e2-standard-4"
20452045
20462046
disk {
20472047
source_image = data.google_compute_image.my_image.self_link
@@ -2081,7 +2081,7 @@ data "google_compute_image" "my_image" {
20812081
20822082
resource "google_compute_instance_template" "foobar" {
20832083
name = "instancet-test-%s"
2084-
machine_type = "n1-standard-1"
2084+
machine_type = "e2-medium"
20852085
can_ip_forward = false
20862086
20872087
disk {
@@ -2147,7 +2147,7 @@ data "google_compute_image" "my_image" {
21472147
21482148
resource "google_compute_instance_template" "foobar" {
21492149
name = "instancet-test-%s"
2150-
machine_type = "n1-standard-1"
2150+
machine_type = "e2-medium"
21512151
can_ip_forward = false
21522152
disk {
21532153
source_image = data.google_compute_image.my_image.self_link
@@ -2172,7 +2172,7 @@ func testAccComputeInstanceTemplate_invalidDiskType(suffix string) string {
21722172
# }
21732173
resource "google_compute_instance_template" "foobar" {
21742174
name = "instancet-test-%s"
2175-
machine_type = "n1-standard-1"
2175+
machine_type = "e2-medium"
21762176
can_ip_forward = false
21772177
disk {
21782178
source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
@@ -2216,7 +2216,7 @@ resource "google_compute_image" "diskimage" {
22162216
}
22172217
resource "google_compute_instance_template" "foobar" {
22182218
name_prefix = "tf-test-instance-"
2219-
machine_type = "n1-standard-1"
2219+
machine_type = "e2-medium"
22202220
disk {
22212221
source_image = google_compute_image.diskimage.self_link
22222222
}

0 commit comments

Comments
 (0)