Merge pull request #315 from kbst/gcs-fuse

GKE: Support GCS fuse CSI driver add-on
kbst · Aug 16, 2023 · d0404b3 · d0404b3
2 parents d31478c + 805a8fa
commit d0404b3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/google/_modules/gke/cluster.tf b/google/_modules/gke/cluster.tf
@@ -48,6 +48,10 @@ resource "google_container_cluster" "current" {
     network_policy_config {
       disabled = false
     }
+
+    gcs_fuse_csi_driver_config {
+      enabled = var.enable_gcs_fuse_csi_driver
+    }
   }
 
   network_policy {

diff --git a/google/_modules/gke/variables.tf b/google/_modules/gke/variables.tf
@@ -207,3 +207,8 @@ variable "monitoring_config_enable_components" {
   description = "Monitoring config components to enable."
   type        = list(string)
 }
+
+variable "enable_gcs_fuse_csi_driver" {
+  description = "Whether to enable GCSFuse CSI driver addon."
+  type        = bool
+}
diff --git a/google/_modules/gke/versions.tf b/google/_modules/gke/versions.tf
@@ -4,7 +4,7 @@ terraform {
     google = {
       # https://registry.terraform.io/providers/hashicorp/google/latest
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.76.0"
     }
 
     kubernetes = {

diff --git a/google/cluster/configuration.tf b/google/cluster/configuration.tf
@@ -91,4 +91,6 @@ locals {
 
   monitoring_config_enable_components_lookup = lookup(local.cfg, "monitoring_config_enable_components", "SYSTEM_COMPONENTS")
   monitoring_config_enable_components        = compact(split(",", local.monitoring_config_enable_components_lookup))
+
+  enable_gcs_fuse_csi_driver = lookup(local.cfg, "enable_gcs_fuse_csi_driver", false)
 }
diff --git a/google/cluster/main.tf b/google/cluster/main.tf
@@ -78,4 +78,6 @@ module "cluster" {
 
   logging_config_enable_components    = local.logging_config_enable_components
   monitoring_config_enable_components = local.monitoring_config_enable_components
+
+  enable_gcs_fuse_csi_driver = local.enable_gcs_fuse_csi_driver
 }