Enable PS CSI through google-container-cluster module

GoogleCloudPlatform · Dec 6, 2024 · 8d3c524 · 8d3c524
1 parent e6abf74
commit 8d3c524
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/modules/scheduler/gke-cluster/README.md b/modules/scheduler/gke-cluster/README.md
@@ -110,15 +110,13 @@ limitations under the License.
 | <a name="requirement_google"></a> [google](#requirement\_google) | > 5.0 |
 | <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | > 5.0 |
 | <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.23 |
-| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_google"></a> [google](#provider\_google) | > 5.0 |
 | <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | > 5.0 |
-| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.0 |
 
 ## Modules
 
@@ -133,7 +131,6 @@ limitations under the License.
 |------|------|
 | [google-beta_google_container_cluster.gke_cluster](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_container_cluster) | resource |
 | [google-beta_google_container_node_pool.system_node_pools](https://registry.terraform.io/providers/hashicorp/google-beta/latest/docs/resources/google_container_node_pool) | resource |
-| [null_resource.enable_parallelstore_csi](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
 | [google_client_config.default](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/client_config) | data source |
 | [google_project.project](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/project) | data source |
 

diff --git a/modules/scheduler/gke-cluster/main.tf b/modules/scheduler/gke-cluster/main.tf
@@ -185,6 +185,9 @@ resource "google_container_cluster" "gke_cluster" {
     dns_cache_config {
       enabled = var.enable_node_local_dns_cache
     }
+    parallelstore_csi_driver_config {
+      enabled = var.enable_parallelstore_csi
+    }
   }
 
   timeouts {
@@ -305,17 +308,6 @@ resource "google_container_node_pool" "system_node_pools" {
   }
 }
 
-### TODO: remove this after Terraform support for GKE Parallelstore CSI is added. ###
-###       Instead use addons_config above to enable the CSI                       ###
-resource "null_resource" "enable_parallelstore_csi" {
-  count = var.enable_parallelstore_csi == true ? 1 : 0
-
-  provisioner "local-exec" {
-    command = "gcloud container clusters update ${local.name} --location=${var.region} --project=${var.project_id} --update-addons=ParallelstoreCsiDriver=ENABLED"
-  }
-  depends_on = [google_container_node_pool.system_node_pools] # avoid cluster operation conflict
-}
-
 data "google_client_config" "default" {}
 
 provider "kubernetes" {

diff --git a/modules/scheduler/gke-cluster/versions.tf b/modules/scheduler/gke-cluster/versions.tf
@@ -28,10 +28,6 @@ terraform {
       source  = "hashicorp/kubernetes"
       version = "~> 2.23"
     }
-    null = {
-      source  = "hashicorp/null"
-      version = "~> 3.0"
-    }
   }
   provider_meta "google" {
     module_name = "blueprints/terraform/hpc-toolkit:gke-cluster/v1.43.0"