Skip to content

Commit b67baaf

Browse files
Remove several GKE version constraints in tests, bump those <1.25 to 1.27 (#8218) (#5826)
Signed-off-by: Modular Magician <[email protected]>
1 parent 00351e2 commit b67baaf

File tree

4 files changed

+14
-27
lines changed

4 files changed

+14
-27
lines changed

.changelog/8218.txt

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

google-beta/resource_container_cluster_test.go

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2615,7 +2615,7 @@ func TestAccContainerCluster_withMonitoringConfig(t *testing.T) {
26152615
CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
26162616
Steps: []resource.TestStep{
26172617
{
2618-
Config: testAccContainerCluster_basic_1_23_16(clusterName),
2618+
Config: testAccContainerCluster_basic(clusterName),
26192619
},
26202620
{
26212621
ResourceName: "google_container_cluster.primary",
@@ -2661,7 +2661,7 @@ func TestAccContainerCluster_withMonitoringConfig(t *testing.T) {
26612661
},
26622662
// Back to basic settings to test setting Prometheus on its own
26632663
{
2664-
Config: testAccContainerCluster_basic_1_23_16(clusterName),
2664+
Config: testAccContainerCluster_basic(clusterName),
26652665
},
26662666
{
26672667
ResourceName: "google_container_cluster.primary",
@@ -2679,7 +2679,7 @@ func TestAccContainerCluster_withMonitoringConfig(t *testing.T) {
26792679
ImportStateVerifyIgnore: []string{"min_master_version"},
26802680
},
26812681
{
2682-
Config: testAccContainerCluster_basic_1_23_16(clusterName),
2682+
Config: testAccContainerCluster_basic(clusterName),
26832683
},
26842684
{
26852685
ResourceName: "google_container_cluster.primary",
@@ -6432,7 +6432,7 @@ resource "google_container_cluster" "with_pco_disabled" {
64326432
network = google_compute_network.container_network.name
64336433
subnetwork = google_compute_subnetwork.container_subnetwork.name
64346434
6435-
min_master_version = "1.23"
6435+
min_master_version = "1.27"
64366436
initial_node_count = 1
64376437
datapath_provider = "ADVANCED_DATAPATH"
64386438
@@ -7329,17 +7329,6 @@ resource "google_container_cluster" "primary" {
73297329
`, name)
73307330
}
73317331

7332-
func testAccContainerCluster_basic_1_23_16(name string) string {
7333-
return fmt.Sprintf(`
7334-
resource "google_container_cluster" "primary" {
7335-
name = "%s"
7336-
location = "us-central1-a"
7337-
initial_node_count = 1
7338-
min_master_version = "1.23.16-gke.200"
7339-
}
7340-
`, name)
7341-
}
7342-
73437332
func testAccContainerCluster_withMonitoringConfigEnabled(name string) string {
73447333
return fmt.Sprintf(`
73457334
data "google_container_engine_versions" "uscentral1a" {
@@ -7350,7 +7339,6 @@ resource "google_container_cluster" "primary" {
73507339
name = "%s"
73517340
location = "us-central1-a"
73527341
initial_node_count = 1
7353-
min_master_version = "1.23.16-gke.200"
73547342
monitoring_config {
73557343
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER" ]
73567344
}
@@ -7377,9 +7365,8 @@ resource "google_container_cluster" "primary" {
73777365
name = "%s"
73787366
location = "us-central1-a"
73797367
initial_node_count = 1
7380-
min_master_version = "1.23.16-gke.200"
73817368
monitoring_config {
7382-
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS" ]
7369+
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER" ]
73837370
}
73847371
}
73857372
`, name)
@@ -7391,7 +7378,6 @@ resource "google_container_cluster" "primary" {
73917378
name = "%s"
73927379
location = "us-central1-a"
73937380
initial_node_count = 1
7394-
min_master_version = "1.23.16-gke.200"
73957381
monitoring_config {
73967382
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER" ]
73977383
managed_prometheus {
@@ -7408,7 +7394,6 @@ resource "google_container_cluster" "primary" {
74087394
name = "%s"
74097395
location = "us-central1-a"
74107396
initial_node_count = 1
7411-
min_master_version = "1.23.16-gke.200"
74127397
monitoring_config {
74137398
enable_components = []
74147399
managed_prometheus {

google-beta/resource_container_node_pool_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ resource "google_compute_subnetwork" "container_subnetwork" {
582582
resource "google_container_cluster" "cluster" {
583583
name = "%s"
584584
location = "us-central1-a"
585-
min_master_version = "1.23"
585+
min_master_version = "1.27"
586586
initial_node_count = 1
587587
588588
network = google_compute_network.container_network.name
@@ -1868,7 +1868,7 @@ resource "google_container_cluster" "cluster" {
18681868
name = "%s"
18691869
location = "us-central1"
18701870
initial_node_count = 3
1871-
min_master_version = "1.24"
1871+
min_master_version = "1.27"
18721872
}
18731873
18741874
resource "google_container_node_pool" "np" {
@@ -1891,7 +1891,7 @@ resource "google_container_cluster" "cluster" {
18911891
name = "%s"
18921892
location = "us-central1"
18931893
initial_node_count = 3
1894-
min_master_version = "1.24"
1894+
min_master_version = "1.27"
18951895
}
18961896
18971897
resource "google_container_node_pool" "np" {
@@ -1919,7 +1919,7 @@ resource "google_container_cluster" "cluster" {
19191919
name = "%s"
19201920
location = "us-central1"
19211921
initial_node_count = 3
1922-
min_master_version = "1.24"
1922+
min_master_version = "1.27"
19231923
}
19241924
19251925
resource "google_container_node_pool" "np" {
@@ -2999,15 +2999,15 @@ resource "google_container_node_pool" "np1" {
29992999
location = "us-central1-a"
30003000
cluster = google_container_cluster.cluster.name
30013001
initial_node_count = 2
3002-
version = "1.23.13-gke.900"
3002+
version = "1.25.10-gke.1400"
30033003
}
30043004
30053005
resource "google_container_node_pool" "np2" {
30063006
name = "%s"
30073007
location = "us-central1-a"
30083008
cluster = google_container_cluster.cluster.name
30093009
initial_node_count = 2
3010-
version = "1.23.13-gke.900"
3010+
version = "1.25.10-gke.1400"
30113011
}
30123012
`, cluster, np1, np2)
30133013
}

website/docs/guides/using_gke_with_terraform.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ resource "google_container_cluster" "demo_cluster" {
227227
name = "demo-cluster"
228228
location = "us-west1-a"
229229
230-
min_master_version = "1.16"
230+
min_master_version = "1.27"
231231
232232
# Enable Alias IPs to allow Windows Server networking.
233233
ip_allocation_policy {

0 commit comments

Comments
 (0)