Skip to content

Commit f4dbacf

Browse files
Update cluster versions in TestAccContainerNodePool_concurrent (#12955) (#21342)
[upstream:15b9d382fd1c512bf5a331adfb1eae964789a18a] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent fea5185 commit f4dbacf

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

.changelog/12955.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/services/container/resource_container_node_pool_test.go

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3763,49 +3763,63 @@ resource "google_container_cluster" "cluster" {
37633763
deletion_protection = false
37643764
network = "%s"
37653765
subnetwork = "%s"
3766+
min_master_version = "1.32.0-gke.1448000"
37663767
}
37673768
37683769
resource "google_container_node_pool" "np1" {
37693770
name = "%s"
37703771
location = "us-central1-a"
37713772
cluster = google_container_cluster.cluster.name
37723773
initial_node_count = 2
3774+
// 2025-02-03: current default cluster version is 1.31.5-gke.1023000. This will change over time.
3775+
// Reference: https://cloud.google.com/kubernetes-engine/docs/release-notes#current_versions
37733776
}
37743777
37753778
resource "google_container_node_pool" "np2" {
37763779
name = "%s"
37773780
location = "us-central1-a"
37783781
cluster = google_container_cluster.cluster.name
37793782
initial_node_count = 2
3783+
// 2025-02-03: current default cluster version is 1.31.5-gke.1023000. This will change over time.
3784+
// Reference: https://cloud.google.com/kubernetes-engine/docs/release-notes#current_versions
37803785
}
37813786
`, cluster, networkName, subnetworkName, np1, np2)
37823787
}
37833788

37843789
func testAccContainerNodePool_concurrentUpdate(cluster, np1, np2, networkName, subnetworkName string) string {
37853790
return fmt.Sprintf(`
37863791
resource "google_container_cluster" "cluster" {
3787-
name = "%s"
3788-
location = "us-central1-a"
3789-
initial_node_count = 3
3792+
name = "%s"
3793+
location = "us-central1-a"
3794+
initial_node_count = 3
37903795
deletion_protection = false
3791-
network = "%s"
3792-
subnetwork = "%s"
3796+
network = "%s"
3797+
subnetwork = "%s"
3798+
min_master_version = "1.32.0-gke.1448000"
37933799
}
37943800
37953801
resource "google_container_node_pool" "np1" {
37963802
name = "%s"
37973803
location = "us-central1-a"
37983804
cluster = google_container_cluster.cluster.name
37993805
initial_node_count = 2
3800-
version = "1.29.4-gke.1043002"
3806+
version = "1.32.0-gke.1448000"
3807+
// The node version must remain within one minor version of the cluster ("master") version, and it must not exceed the cluster ("master") version
3808+
// Cross-ref: https://github.com/hashicorp/terraform-provider-google/issues/21116
3809+
// Cross-ref: https://github.com/GoogleCloudPlatform/magic-modules/pull/11115
3810+
// Reference: https://cloud.google.com/kubernetes-engine/docs/release-notes#current_versions
38013811
}
38023812
38033813
resource "google_container_node_pool" "np2" {
38043814
name = "%s"
38053815
location = "us-central1-a"
38063816
cluster = google_container_cluster.cluster.name
38073817
initial_node_count = 2
3808-
version = "1.29.4-gke.1043002"
3818+
version = "1.32.0-gke.1448000"
3819+
// The node version must remain within one minor version of the cluster ("master") version, and it must not exceed the cluster ("master") version
3820+
// Cross-ref: https://github.com/hashicorp/terraform-provider-google/issues/21116
3821+
// Cross-ref: https://github.com/GoogleCloudPlatform/magic-modules/pull/11115
3822+
// Reference: https://cloud.google.com/kubernetes-engine/docs/release-notes#current_versions
38093823
}
38103824
`, cluster, networkName, subnetworkName, np1, np2)
38113825
}

0 commit comments

Comments
 (0)