Skip to content

Commit 87190ab

Browse files
modular-magicianmodular-magician
committed
Added support for additional values KCP_HPA in `google_container_clus… (#12221)
[upstream:ad2ff30080e3b6b9d3129fdac496694acf9c7120] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 5980fcc commit 87190ab

File tree

4 files changed

+43
-21
lines changed

4 files changed

+43
-21
lines changed

‎.changelog/12221.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note: enhancement
2+
container: added additional value `KCP_HPA` for `logging_config.enable_components` field in `google_container_cluster` resource
3+
```

‎google/services/container/resource_container_cluster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -966,10 +966,10 @@ func ResourceContainerCluster() *schema.Resource {
966966
"enable_components": {
967967
Type: schema.TypeList,
968968
Required: true,
969-
Description: `GKE components exposing logs. Valid values include SYSTEM_COMPONENTS, APISERVER, CONTROLLER_MANAGER, KCP_CONNECTION, KCP_SSHD, SCHEDULER, and WORKLOADS.`,
969+
Description: `GKE components exposing logs. Valid values include SYSTEM_COMPONENTS, APISERVER, CONTROLLER_MANAGER, KCP_CONNECTION, KCP_SSHD, KCP_HPA, SCHEDULER, and WORKLOADS.`,
970970
Elem: &schema.Schema{
971971
Type: schema.TypeString,
972-
ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "KCP_CONNECTION", "KCP_SSHD", "SCHEDULER", "WORKLOADS"}, false),
972+
ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "KCP_CONNECTION", "KCP_SSHD", "KCP_HPA", "SCHEDULER", "WORKLOADS"}, false),
973973
},
974974
},
975975
},

‎google/services/container/resource_container_cluster_migratev1.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -666,10 +666,10 @@ func resourceContainerClusterResourceV1() *schema.Resource {
666666
"enable_components": {
667667
Type: schema.TypeList,
668668
Required: true,
669-
Description: `GKE components exposing logs. Valid values include SYSTEM_COMPONENTS, APISERVER, CONTROLLER_MANAGER, KCP_CONNECTION, KCP_SSHD, SCHEDULER, and WORKLOADS.`,
669+
Description: `GKE components exposing logs. Valid values include SYSTEM_COMPONENTS, APISERVER, CONTROLLER_MANAGER, KCP_CONNECTION, KCP_SSHD, KCP_HPA, SCHEDULER, and WORKLOADS.`,
670670
Elem: &schema.Schema{
671671
Type: schema.TypeString,
672-
ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "KCP_CONNECTION", "KCP_SSHD", "SCHEDULER", "WORKLOADS"}, false),
672+
ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "KCP_CONNECTION", "KCP_SSHD", "KCP_HPA", "SCHEDULER", "WORKLOADS"}, false),
673673
},
674674
},
675675
},

‎google/services/container/resource_container_cluster_test.go

+36-17
Original file line numberDiff line numberDiff line change
@@ -3784,55 +3784,56 @@ func TestAccContainerCluster_withLoggingConfig(t *testing.T) {
37843784
clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10))
37853785
networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster")
37863786
subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName)
3787+
minVersion := "1.32"
37873788
acctest.VcrTest(t, resource.TestCase{
37883789
PreCheck: func() { acctest.AccTestPreCheck(t) },
37893790
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
37903791
CheckDestroy: testAccCheckContainerClusterDestroyProducer(t),
37913792
Steps: []resource.TestStep{
37923793
{
3793-
Config: testAccContainerCluster_basic(clusterName, networkName, subnetworkName),
3794+
Config: testAccContainerCluster_basicWithMinGKEVersion(clusterName, networkName, subnetworkName, minVersion),
37943795
},
37953796
{
37963797
ResourceName: "google_container_cluster.primary",
37973798
ImportState: true,
37983799
ImportStateVerify: true,
3799-
ImportStateVerifyIgnore: []string{"deletion_protection"},
3800+
ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
38003801
},
38013802
{
3802-
Config: testAccContainerCluster_withLoggingConfigEnabled(clusterName, networkName, subnetworkName),
3803+
Config: testAccContainerCluster_withLoggingConfigEnabled(clusterName, networkName, subnetworkName, minVersion),
38033804
},
38043805
{
38053806
ResourceName: "google_container_cluster.primary",
38063807
ImportState: true,
38073808
ImportStateVerify: true,
3808-
ImportStateVerifyIgnore: []string{"deletion_protection"},
3809+
ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
38093810
},
38103811
{
3811-
Config: testAccContainerCluster_withLoggingConfigDisabled(clusterName, networkName, subnetworkName),
3812+
Config: testAccContainerCluster_withLoggingConfigDisabled(clusterName, networkName, subnetworkName, minVersion),
38123813
},
38133814
{
38143815
ResourceName: "google_container_cluster.primary",
38153816
ImportState: true,
38163817
ImportStateVerify: true,
3817-
ImportStateVerifyIgnore: []string{"deletion_protection"},
3818+
ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
38183819
},
38193820
{
3820-
Config: testAccContainerCluster_withLoggingConfigUpdated(clusterName, networkName, subnetworkName),
3821+
Config: testAccContainerCluster_withLoggingConfigUpdated(clusterName, networkName, subnetworkName, minVersion),
38213822
},
38223823
{
38233824
ResourceName: "google_container_cluster.primary",
38243825
ImportState: true,
38253826
ImportStateVerify: true,
3826-
ImportStateVerifyIgnore: []string{"deletion_protection"},
3827+
ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
38273828
},
38283829
{
3829-
Config: testAccContainerCluster_basic(clusterName, networkName, subnetworkName),
3830+
Config: testAccContainerCluster_basicWithMinGKEVersion(clusterName, networkName, subnetworkName, minVersion),
38303831
},
38313832
{
38323833
ResourceName: "google_container_cluster.primary",
38333834
ImportState: true,
38343835
ImportStateVerify: true,
3835-
ImportStateVerifyIgnore: []string{"deletion_protection"},
3836+
ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
38363837
},
38373838
},
38383839
})
@@ -5854,6 +5855,21 @@ resource "google_container_cluster" "primary" {
58545855
`, name, networkName, subnetworkName)
58555856
}
58565857

5858+
func testAccContainerCluster_basicWithMinGKEVersion(name, networkName, subnetworkName string, minVersion string) string {
5859+
return fmt.Sprintf(`
5860+
resource "google_container_cluster" "primary" {
5861+
name = "%s"
5862+
location = "us-central1-a"
5863+
initial_node_count = 1
5864+
network = "%s"
5865+
subnetwork = "%s"
5866+
min_master_version = "%s"
5867+
5868+
deletion_protection = false
5869+
}
5870+
`, name, networkName, subnetworkName, minVersion)
5871+
}
5872+
58575873
func testAccContainerCluster_forSecretManagerConfig(projectID, name, networkName, subnetworkName string) string {
58585874
return fmt.Sprintf(`
58595875
data "google_project" "project" {
@@ -10145,7 +10161,7 @@ resource "google_container_cluster" "primary" {
1014510161
`, projectID, name, networkName, subnetworkName)
1014610162
}
1014710163

10148-
func testAccContainerCluster_withLoggingConfigEnabled(name, networkName, subnetworkName string) string {
10164+
func testAccContainerCluster_withLoggingConfigEnabled(name, networkName, subnetworkName string, minVersion string) string {
1014910165
return fmt.Sprintf(`
1015010166
resource "google_container_cluster" "primary" {
1015110167
name = "%s"
@@ -10160,11 +10176,12 @@ resource "google_container_cluster" "primary" {
1016010176
deletion_protection = false
1016110177
network = "%s"
1016210178
subnetwork = "%s"
10179+
min_master_version = "%s"
1016310180
}
10164-
`, name, networkName, subnetworkName)
10181+
`, name, networkName, subnetworkName, minVersion)
1016510182
}
1016610183

10167-
func testAccContainerCluster_withLoggingConfigDisabled(name, networkName, subnetworkName string) string {
10184+
func testAccContainerCluster_withLoggingConfigDisabled(name, networkName, subnetworkName string, minVersion string) string {
1016810185
return fmt.Sprintf(`
1016910186
resource "google_container_cluster" "primary" {
1017010187
name = "%s"
@@ -10176,27 +10193,29 @@ resource "google_container_cluster" "primary" {
1017610193
deletion_protection = false
1017710194
network = "%s"
1017810195
subnetwork = "%s"
10196+
min_master_version = "%s"
1017910197
}
10180-
`, name, networkName, subnetworkName)
10198+
`, name, networkName, subnetworkName, minVersion)
1018110199
}
1018210200

10183-
func testAccContainerCluster_withLoggingConfigUpdated(name, networkName, subnetworkName string) string {
10201+
func testAccContainerCluster_withLoggingConfigUpdated(name, networkName, subnetworkName string, minVersion string) string {
1018410202
return fmt.Sprintf(`
1018510203
resource "google_container_cluster" "primary" {
1018610204
name = "%s"
1018710205
location = "us-central1-a"
1018810206
initial_node_count = 1
1018910207
logging_config {
10190-
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "KCP_CONNECTION", "KCP_SSHD"]
10208+
enable_components = [ "SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "KCP_CONNECTION", "KCP_SSHD", "KCP_HPA"]
1019110209
}
1019210210
monitoring_config {
1019310211
enable_components = [ "SYSTEM_COMPONENTS" ]
1019410212
}
1019510213
deletion_protection = false
1019610214
network = "%s"
1019710215
subnetwork = "%s"
10216+
min_master_version = "%s"
1019810217
}
10199-
`, name, networkName, subnetworkName)
10218+
`, name, networkName, subnetworkName, minVersion)
1020010219
}
1020110220

1020210221
func testAccContainerCluster_withMonitoringConfigEnabled(name, networkName, subnetworkName string) string {

0 commit comments

Comments
 (0)