Skip to content

feat(safer-cluster): add support for gcs fuse csi driver #2384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions autogen/safer-cluster/main.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ module "gke" {

gce_pd_csi_driver = var.gce_pd_csi_driver
filestore_csi_driver = var.filestore_csi_driver
gcs_fuse_csi_driver = var.gcs_fuse_csi_driver

notification_config_topic = var.notification_config_topic

Expand Down
6 changes: 6 additions & 0 deletions autogen/safer-cluster/variables.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,12 @@ variable "filestore_csi_driver" {
default = false
}

variable "gcs_fuse_csi_driver" {
type = bool
description = "Whether GCE FUSE CSI driver is enabled for this cluster."
default = false
}

variable "add_cluster_firewall_rules" {
type = bool
description = "Create additional firewall rules"
Expand Down
1 change: 1 addition & 0 deletions modules/safer-cluster-update-variant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
| gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
Expand Down
1 change: 1 addition & 0 deletions modules/safer-cluster-update-variant/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ module "gke" {

gce_pd_csi_driver = var.gce_pd_csi_driver
filestore_csi_driver = var.filestore_csi_driver
gcs_fuse_csi_driver = var.gcs_fuse_csi_driver

notification_config_topic = var.notification_config_topic

Expand Down
3 changes: 3 additions & 0 deletions modules/safer-cluster-update-variant/metadata.display.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ spec:
gce_pd_csi_driver:
name: gce_pd_csi_driver
title: Gce Pd Csi Driver
gcs_fuse_csi_driver:
name: gcs_fuse_csi_driver
title: Gcs Fuse Csi Driver
gke_backup_agent_config:
name: gke_backup_agent_config
title: Gke Backup Agent Config
Expand Down
4 changes: 4 additions & 0 deletions modules/safer-cluster-update-variant/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,10 @@ spec:
description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes
varType: bool
defaultValue: false
- name: gcs_fuse_csi_driver
description: Whether GCE FUSE CSI driver is enabled for this cluster.
varType: bool
defaultValue: false
- name: add_cluster_firewall_rules
description: Create additional firewall rules
varType: bool
Expand Down
6 changes: 6 additions & 0 deletions modules/safer-cluster-update-variant/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,12 @@ variable "filestore_csi_driver" {
default = false
}

variable "gcs_fuse_csi_driver" {
type = bool
description = "Whether GCE FUSE CSI driver is enabled for this cluster."
default = false
}

variable "add_cluster_firewall_rules" {
type = bool
description = "Create additional firewall rules"
Expand Down
1 change: 1 addition & 0 deletions modules/safer-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ For simplicity, we suggest using `roles/container.admin` and
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
| gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | `bool` | `true` | no |
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
Expand Down
1 change: 1 addition & 0 deletions modules/safer-cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ module "gke" {

gce_pd_csi_driver = var.gce_pd_csi_driver
filestore_csi_driver = var.filestore_csi_driver
gcs_fuse_csi_driver = var.gcs_fuse_csi_driver

notification_config_topic = var.notification_config_topic

Expand Down
3 changes: 3 additions & 0 deletions modules/safer-cluster/metadata.display.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ spec:
gce_pd_csi_driver:
name: gce_pd_csi_driver
title: Gce Pd Csi Driver
gcs_fuse_csi_driver:
name: gcs_fuse_csi_driver
title: Gcs Fuse Csi Driver
gke_backup_agent_config:
name: gke_backup_agent_config
title: Gke Backup Agent Config
Expand Down
4 changes: 4 additions & 0 deletions modules/safer-cluster/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,10 @@ spec:
description: The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes
varType: bool
defaultValue: false
- name: gcs_fuse_csi_driver
description: Whether GCE FUSE CSI driver is enabled for this cluster.
varType: bool
defaultValue: false
- name: add_cluster_firewall_rules
description: Create additional firewall rules
varType: bool
Expand Down
6 changes: 6 additions & 0 deletions modules/safer-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,12 @@ variable "filestore_csi_driver" {
default = false
}

variable "gcs_fuse_csi_driver" {
type = bool
description = "Whether GCE FUSE CSI driver is enabled for this cluster."
default = false
}

variable "add_cluster_firewall_rules" {
type = bool
description = "Create additional firewall rules"
Expand Down