Skip to content

Commit c708eea

Browse files
Fix confidential GKE test (#4384) (#2858)
Signed-off-by: Modular Magician <[email protected]>
1 parent ba4fe8c commit c708eea

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

.changelog/4384.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: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -236,28 +236,25 @@ func TestAccContainerCluster_withConfidentialNodes(t *testing.T) {
236236
Config: testAccContainerCluster_withConfidentialNodes(clusterName, npName),
237237
},
238238
{
239-
ResourceName: "google_container_cluster.confidential_nodes",
240-
ImportState: true,
241-
ImportStateVerify: true,
242-
ImportStateVerifyIgnore: []string{"min_master_version"},
239+
ResourceName: "google_container_cluster.confidential_nodes",
240+
ImportState: true,
241+
ImportStateVerify: true,
243242
},
244243
{
245244
Config: testAccContainerCluster_disableConfidentialNodes(clusterName, npName),
246245
},
247246
{
248-
ResourceName: "google_container_cluster.confidential_nodes",
249-
ImportState: true,
250-
ImportStateVerify: true,
251-
ImportStateVerifyIgnore: []string{"min_master_version"},
247+
ResourceName: "google_container_cluster.confidential_nodes",
248+
ImportState: true,
249+
ImportStateVerify: true,
252250
},
253251
{
254252
Config: testAccContainerCluster_withConfidentialNodes(clusterName, npName),
255253
},
256254
{
257-
ResourceName: "google_container_cluster.confidential_nodes",
258-
ImportState: true,
259-
ImportStateVerify: true,
260-
ImportStateVerifyIgnore: []string{"min_master_version"},
255+
ResourceName: "google_container_cluster.confidential_nodes",
256+
ImportState: true,
257+
ImportStateVerify: true,
261258
},
262259
},
263260
})
@@ -2448,9 +2445,6 @@ resource "google_container_cluster" "confidential_nodes" {
24482445
name = "%s"
24492446
location = "us-central1-a"
24502447
enable_shielded_nodes = true
2451-
// Minimum version for confidential node support.
2452-
// Can be removed once default version is greater or equal to this version.
2453-
min_master_version = "1.18.12-gke.300"
24542448
release_channel {
24552449
channel = "RAPID"
24562450
}
@@ -2476,9 +2470,6 @@ resource "google_container_cluster" "confidential_nodes" {
24762470
name = "%s"
24772471
location = "us-central1-a"
24782472
enable_shielded_nodes = true
2479-
// Minimum version for confidential node support.
2480-
// Can be removed once default version is greater or equal to this version.
2481-
min_master_version = "1.18.12-gke.300"
24822473
release_channel {
24832474
channel = "RAPID"
24842475
}

0 commit comments

Comments
 (0)