Skip to content

Commit 2f5a276

Browse files
bharathkkbbharathkkb
authored
feat!: support gcs fuse addon (#1722)
1 parent 822e8e0 commit 2f5a276

File tree

40 files changed

+223
-75
lines changed

40 files changed

+223
-75
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ Then perform the following commands on the root folder:
163163
| firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
164164
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
165165
| gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
166+
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
166167
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
167168
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
168169
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,14 @@ resource "google_container_cluster" "primary" {
287287
}
288288
}
289289

290+
dynamic "gcs_fuse_csi_driver_config" {
291+
for_each = local.gcs_fuse_csi_driver_config
292+
293+
content {
294+
enabled = gcs_fuse_csi_driver_config.value.enabled
295+
}
296+
}
297+
290298
config_connector_config {
291299
enabled = var.config_connector
292300
}

‎autogen/main/main.tf.tmpl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,10 @@ locals {
103103
enabled = false
104104
provider = null
105105
}]
106-
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
107-
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
108-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
106+
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
107+
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
108+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
109+
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
109110
{% endif %}
110111
{% if beta_cluster and autopilot_cluster != true %}
111112
cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {

‎autogen/main/variables.tf.tmpl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,12 @@ variable "gke_backup_agent_config" {
676676
default = false
677677
}
678678

679+
variable "gcs_fuse_csi_driver" {
680+
type = bool
681+
description = "Whether GCE FUSE CSI driver is enabled for this cluster."
682+
default = false
683+
}
684+
679685
{% endif %}
680686
variable "timeouts" {
681687
type = map(string)

‎autogen/main/versions.tf.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ terraform {
2424
required_providers {
2525
google = {
2626
source = "hashicorp/google"
27-
version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
27+
version = ">= 4.76.0, < 5.0, !=4.65.0, !=4.65.1"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
31+
version = ">= 4.76.0, < 5.0, !=4.65.0, !=4.65.1"
3232
}
3333
kubernetes = {
3434
source = "hashicorp/kubernetes"

‎cluster.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,14 @@ resource "google_container_cluster" "primary" {
202202
}
203203
}
204204

205+
dynamic "gcs_fuse_csi_driver_config" {
206+
for_each = local.gcs_fuse_csi_driver_config
207+
208+
content {
209+
enabled = gcs_fuse_csi_driver_config.value.enabled
210+
}
211+
}
212+
205213
config_connector_config {
206214
enabled = var.config_connector
207215
}

‎examples/simple_regional/main.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ module "gke" {
4040
service_account = var.compute_engine_service_account
4141
enable_cost_allocation = true
4242
enable_binary_authorization = var.enable_binary_authorization
43+
gcs_fuse_csi_driver = true
4344
}

‎main.tf‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,10 @@ locals {
8888
enabled = false
8989
provider = null
9090
}]
91-
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
92-
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
93-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
91+
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
92+
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
93+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
94+
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
9495

9596
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
9697
security_group = var.authenticator_security_group

‎modules/beta-autopilot-private-cluster/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
24+
version = ">= 4.76.0, < 5.0, !=4.65.0, !=4.65.1"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
28+
version = ">= 4.76.0, < 5.0, !=4.65.0, !=4.65.1"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

‎modules/beta-autopilot-public-cluster/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
24+
version = ">= 4.76.0, < 5.0, !=4.65.0, !=4.65.1"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 4.51.0, < 5.0, !=4.65.0, !=4.65.1"
28+
version = ">= 4.76.0, < 5.0, !=4.65.0, !=4.65.1"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

0 commit comments

Comments
 (0)