diff --git a/.changelog/11542.txt b/.changelog/11542.txt new file mode 100644 index 0000000000..137d6db0c0 --- /dev/null +++ b/.changelog/11542.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +conatainer: bump `gcfs_config` to GA +``` \ No newline at end of file diff --git a/google-beta/services/container/node_config.go b/google-beta/services/container/node_config.go index 7f1a99641f..a06f5a015f 100644 --- a/google-beta/services/container/node_config.go +++ b/google-beta/services/container/node_config.go @@ -834,12 +834,14 @@ func expandNodeConfigDefaults(configured interface{}) *container.NodeConfigDefau }, } } + if v, ok := config["gcfs_config"]; ok && len(v.([]interface{})) > 0 { gcfsConfig := v.([]interface{})[0].(map[string]interface{}) nodeConfigDefaults.GcfsConfig = &container.GcfsConfig{ Enabled: gcfsConfig["enabled"].(bool), } } + return nodeConfigDefaults } @@ -1458,6 +1460,7 @@ func flattenNodeConfigDefaults(c *container.NodeConfigDefaults) []map[string]int result[0]["logging_variant"] = flattenLoggingVariant(c.LoggingConfig) result[0]["gcfs_config"] = flattenGcfsConfig(c.GcfsConfig) + return result } diff --git a/google-beta/services/container/resource_container_cluster_test.go b/google-beta/services/container/resource_container_cluster_test.go index 503038a59e..0033a71782 100644 --- a/google-beta/services/container/resource_container_cluster_test.go +++ b/google-beta/services/container/resource_container_cluster_test.go @@ -6920,7 +6920,7 @@ resource "google_container_cluster" "with_node_pool_defaults" { } deletion_protection = false network = "%s" - subnetwork = "%s" + subnetwork = "%s" } `, clusterName, enabled, networkName, subnetworkName) } diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index c4fc1f7c3a..512283c150 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -1118,7 +1118,7 @@ The `node_config_defaults` block supports: * `logging_variant` (Optional) The type of logging agent that is deployed by default for newly created node pools in the cluster. Valid values include DEFAULT and MAX_THROUGHPUT. See [Increasing logging agent throughput](https://cloud.google.com/stackdriver/docs/solutions/gke/managing-logs#throughput) for more information. -* `gcfs_config` (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) The default Google Container Filesystem (GCFS) configuration at the cluster level. e.g. enable [image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming) across all the node pools within the cluster. Structure is [documented below](#nested_gcfs_config). +* `gcfs_config` (Optional) The default Google Container Filesystem (GCFS) configuration at the cluster level. e.g. enable [image streaming](https://cloud.google.com/kubernetes-engine/docs/how-to/image-streaming) across all the node pools within the cluster. Structure is [documented below](#nested_gcfs_config). The `notification_config` block supports: