From 926bbbef4f8e5658ae7ab6c59ce8ee9b8750f171 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Mon, 25 Sep 2023 23:10:29 +0000 Subject: [PATCH] fix(container_node_pool): support fuse csi driver for autopilot cluster (#8998) Signed-off-by: Tsubasa Nagasawa Signed-off-by: Modular Magician --- .changelog/8998.txt | 3 +++ .../container/resource_container_cluster.go | 13 ++++++------- website/docs/r/container_cluster.html.markdown | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .changelog/8998.txt diff --git a/.changelog/8998.txt b/.changelog/8998.txt new file mode 100644 index 00000000000..567ed7fed26 --- /dev/null +++ b/.changelog/8998.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +container: allow setting `addons_config.gcs_fuse_csi_driver_config` on `google_container_cluster` with `enable_autopilot: true`. +``` diff --git a/google/services/container/resource_container_cluster.go b/google/services/container/resource_container_cluster.go index 4634ac78989..7f5c2e874b0 100644 --- a/google/services/container/resource_container_cluster.go +++ b/google/services/container/resource_container_cluster.go @@ -394,13 +394,12 @@ func ResourceContainerCluster() *schema.Resource { }, }, "gcs_fuse_csi_driver_config": { - Type: schema.TypeList, - Optional: true, - Computed: true, - AtLeastOneOf: addonsConfigKeys, - MaxItems: 1, - Description: `The status of the GCS Fuse CSI driver addon, which allows the usage of gcs bucket as volumes. Defaults to disabled; set enabled = true to enable.`, - ConflictsWith: []string{"enable_autopilot"}, + Type: schema.TypeList, + Optional: true, + Computed: true, + AtLeastOneOf: addonsConfigKeys, + MaxItems: 1, + Description: `The status of the GCS Fuse CSI driver addon, which allows the usage of gcs bucket as volumes. Defaults to disabled; set enabled = true to enable.`, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "enabled": { diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index c75c9a6371c..cc08f95c240 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -409,7 +409,9 @@ Enable/Disable Security Posture API features for the cluster. Structure is [docu * `gcs_fuse_csi_driver_config` - (Optional) The status of the GCSFuse CSI driver addon, which allows the usage of a gcs bucket as volumes. - It is disabled by default; set `enabled = true` to enable. + It is disabled by default for Standard clusters; set `enabled = true` to enable. + It is enabled by default for Autopilot clusters with version 1.24 or later; set `enabled = true` to enable it explicitly. + See [Enable the Cloud Storage FUSE CSI driver](https://cloud.google.com/kubernetes-engine/docs/how-to/persistent-volumes/cloud-storage-fuse-csi-driver#enable) for more information. * `cloudrun_config` - (Optional). Structure is [documented below](#nested_cloudrun_config).