Expose gce_pd_csi_driver for Safer Cluster modules #503

autogen/safer-cluster/main.tf.tmpl

@@ -154,4 +154,6 @@ module "gke" {
   enable_shielded_nodes = var.enable_shielded_nodes
 
   skip_provisioners = var.skip_provisioners
+
+  gce_pd_csi_driver = var.gce_pd_csi_driver
 }

autogen/safer-cluster/variables.tf.tmpl

@@ -336,3 +336,9 @@ variable "pod_security_policy_config" {
     "enabled" = true
   }]
 }
+
+variable "gce_pd_csi_driver" {
+  type        = bool
+  description = "(Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver."
+  default     = true
+}

modules/safer-cluster-update-variant/README.md

@@ -214,6 +214,7 @@ For simplicity, we suggest using `roles/container.admin` and
 | enable\_resource\_consumption\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | bool | `"true"` | no |
 | enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | bool | `"true"` | no |
 | enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | bool | `"false"` | 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 |
 | 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 |
 | http\_load\_balancing | Enable httpload balancer addon. The addon allows whoever can create Ingress objects to expose an application to a public IP. Network policies or Gatekeeper policies should be used to verify that only authorized applications are exposed. | bool | `"true"` | no |

modules/safer-cluster-update-variant/main.tf

@@ -150,4 +150,6 @@ module "gke" {
   enable_shielded_nodes = var.enable_shielded_nodes
 
   skip_provisioners = var.skip_provisioners
+
+  gce_pd_csi_driver = var.gce_pd_csi_driver
 }

modules/safer-cluster-update-variant/variables.tf

@@ -336,3 +336,9 @@ variable "pod_security_policy_config" {
     "enabled" = true
   }]
 }
+
+variable "gce_pd_csi_driver" {
+  type        = bool
+  description = "(Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver."
+  default     = true
+}

modules/safer-cluster/README.md

@@ -214,6 +214,7 @@ For simplicity, we suggest using `roles/container.admin` and
 | enable\_resource\_consumption\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | bool | `"true"` | no |
 | enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster. | bool | `"true"` | no |
 | enable\_vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it | bool | `"false"` | 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 |
 | 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 |
 | http\_load\_balancing | Enable httpload balancer addon. The addon allows whoever can create Ingress objects to expose an application to a public IP. Network policies or Gatekeeper policies should be used to verify that only authorized applications are exposed. | bool | `"true"` | no |

modules/safer-cluster/main.tf

@@ -150,4 +150,6 @@ module "gke" {
   enable_shielded_nodes = var.enable_shielded_nodes
 
   skip_provisioners = var.skip_provisioners
+
+  gce_pd_csi_driver = var.gce_pd_csi_driver
 }

modules/safer-cluster/variables.tf

@@ -336,3 +336,9 @@ variable "pod_security_policy_config" {
     "enabled" = true
   }]
 }
+
+variable "gce_pd_csi_driver" {
+  type        = bool
+  description = "(Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver."
+  default     = true
+}