Skip to content

Commit

Permalink
container: bump gcsfs to GA (#11542) (#8277)
Browse files Browse the repository at this point in the history
[upstream:a85530e20d0cb0739e0f209112b90d4ad3578eba]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Sep 24, 2024
1 parent 46ceff1 commit 1c685b1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .changelog/11542.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
conatainer: bump `gcfs_config` to GA
```
3 changes: 3 additions & 0 deletions google-beta/services/container/node_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/container_cluster.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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).

<a name="nested_notification_config"></a>The `notification_config` block supports:

Expand Down

0 comments on commit 1c685b1

Please sign in to comment.