Merge pull request #315 from kbst/gcs-fuse

pst · web-flow · commit d0404b32819f · 2023-08-16T15:50:18.000+02:00
GKE: Support GCS fuse CSI driver add-on
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
 }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ resource "google_container_cluster" "current" {`
`48`	`48`	`network_policy_config {`
`49`	`49`	`disabled = false`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ gcs_fuse_csi_driver_config {`
	`53`	`+ enabled = var.enable_gcs_fuse_csi_driver`
	`54`	`+ }`
`51`	`55`	`}`
`52`	`56`
`53`	`57`	`network_policy {`
Original file line number	Diff line number	Diff line change
`@@ -207,3 +207,8 @@ variable "monitoring_config_enable_components" {`
`207`	`207`	`description = "Monitoring config components to enable."`
`208`	`208`	`type = list(string)`
`209`	`209`	`}`
	`210`	`+`
	`211`	`+variable "enable_gcs_fuse_csi_driver" {`
	`212`	`+ description = "Whether to enable GCSFuse CSI driver addon."`
	`213`	`+ type = bool`
	`214`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`google = {`
`5`	`5`	`# https://registry.terraform.io/providers/hashicorp/google/latest`
`6`	`6`	`source = "hashicorp/google"`
`7`		`- version = ">= 4.0.0"`
	`7`	`+ version = ">= 4.76.0"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`kubernetes = {`
Original file line number	Diff line number	Diff line change
`@@ -91,4 +91,6 @@ locals {`
`91`	`91`
`92`	`92`	`monitoring_config_enable_components_lookup = lookup(local.cfg, "monitoring_config_enable_components", "SYSTEM_COMPONENTS")`
`93`	`93`	`monitoring_config_enable_components = compact(split(",", local.monitoring_config_enable_components_lookup))`
	`94`	`+`
	`95`	`+ enable_gcs_fuse_csi_driver = lookup(local.cfg, "enable_gcs_fuse_csi_driver", false)`
`94`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,4 +78,6 @@ module "cluster" {`
`78`	`78`
`79`	`79`	`logging_config_enable_components = local.logging_config_enable_components`
`80`	`80`	`monitoring_config_enable_components = local.monitoring_config_enable_components`
	`81`	`+`
	`82`	`+ enable_gcs_fuse_csi_driver = local.enable_gcs_fuse_csi_driver`
`81`	`83`	`}`