Skip to content

Commit cf37b13

Browse files
Fix TestAccContainerCluster_withILBSubsetting (#4824) (#3290)
Co-authored-by: upodroid <[email protected]> Signed-off-by: Modular Magician <[email protected]> Co-authored-by: upodroid <[email protected]>
1 parent 5493443 commit cf37b13

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.changelog/4824.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_container_cluster_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,7 +2535,7 @@ resource "google_container_cluster" "confidential_nodes" {
25352535
name = "%s"
25362536
initial_node_count = 1
25372537
node_config {
2538-
machine_type = "n2d-standard-2"
2538+
machine_type = "n2d-standard-2" // can't be e2 because Confidential Nodes require AMD CPUs
25392539
}
25402540
}
25412541
@@ -2585,7 +2585,7 @@ resource "google_container_cluster" "confidential_nodes" {
25852585
name = "%s"
25862586
initial_node_count = 1
25872587
node_config {
2588-
machine_type = "n2d-standard-2"
2588+
machine_type = "e2-medium"
25892589
}
25902590
}
25912591
@@ -2608,7 +2608,7 @@ resource "google_container_cluster" "confidential_nodes" {
26082608
name = "%s"
26092609
initial_node_count = 1
26102610
node_config {
2611-
machine_type = "n2d-standard-2"
2611+
machine_type = "e2-medium"
26122612
}
26132613
}
26142614
@@ -3159,7 +3159,7 @@ resource "google_container_cluster" "with_node_config_scope_alias" {
31593159
initial_node_count = 1
31603160
31613161
node_config {
3162-
machine_type = "g1-small"
3162+
machine_type = "e2-medium"
31633163
disk_size_gb = 15
31643164
oauth_scopes = ["compute-rw", "storage-ro", "logging-write", "monitoring"]
31653165
}

google-beta/resource_dataproc_cluster_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import (
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1515

16-
"google.golang.org/api/googleapi"
17-
1816
dataproc "google.golang.org/api/dataproc/v1beta2"
17+
"google.golang.org/api/googleapi"
1918
)
2019

2120
func TestDataprocExtractInitTimeout(t *testing.T) {

0 commit comments

Comments
 (0)