@@ -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-
73437332func testAccContainerCluster_withMonitoringConfigEnabled (name string ) string {
73447333 return fmt .Sprintf (`
73457334data "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 {
0 commit comments