Create PV and PVC from network storage passed into gke nodeset

Author: ACW101

community/examples/slurm-gke/slurm-gke.yaml

@@ -123,18 +123,9 @@ deployment_groups:
       install_slurm_chart: false
     outputs: [instructions]
 
-  - id: homefs-pv
-    source: modules/file-system/gke-persistent-volume
-    use: [homefs, gke_cluster]
-    settings:
-      capacity_gib: 1024
-      namespace: $(vars.slurm_namespace)
-      pv_name: home-pv
-      pvc_name: home-pvc
-
   - id: gke_compute_nodeset
     source: community/modules/compute/gke-nodeset
-    use: [gke_compute_pool, slinky, homefs-pv, slurm_controller, network]
+    use: [gke_compute_pool, slinky, homefs, slurm_controller, network]
     settings:
       slurm_cluster_name: $(vars.deployment_name)
       image: $(vars.slinky_image)

community/modules/compute/gke-nodeset/README.md

@@ -16,6 +16,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_home_pv"></a> [home\_pv](#module\_home\_pv) | ../../../../modules/file-system/gke-persistent-volume | n/a |
 | <a name="module_kubectl_apply"></a> [kubectl\_apply](#module\_kubectl\_apply) | ../../../../modules/management/kubectl-apply | n/a |
 | <a name="module_slurm_key_pv"></a> [slurm\_key\_pv](#module\_slurm\_key\_pv) | ../../../../modules/file-system/gke-persistent-volume | n/a |
 
@@ -31,13 +32,14 @@
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_cluster_id"></a> [cluster\_id](#input\_cluster\_id) | projects/{{project}}/locations/{{location}}/clusters/{{cluster}} | `string` | n/a | yes |
+| <a name="input_filestore_id"></a> [filestore\_id](#input\_filestore\_id) | An array of identifier for a filestore with the format `projects/{{project}}/locations/{{location}}/instances/{{name}}`. | `string` | n/a | yes |
 | <a name="input_image"></a> [image](#input\_image) | The image for slurm daemon | `string` | n/a | yes |
 | <a name="input_instance_templates"></a> [instance\_templates](#input\_instance\_templates) | The URLs of Instance Templates | `list(string)` | n/a | yes |
+| <a name="input_network_storage"></a> [network\_storage](#input\_network\_storage) | An array of network attached storage mounts to be configured on nodes. | <pre>object({<br/>    server_ip             = string,<br/>    remote_mount          = string,<br/>    local_mount           = string,<br/>    fs_type               = string,<br/>    mount_options         = string,<br/>    client_install_runner = map(string)<br/>    mount_runner          = map(string)<br/>  })</pre> | n/a | yes |
 | <a name="input_node_count_static"></a> [node\_count\_static](#input\_node\_count\_static) | The number of static nodes in node-pool | `number` | n/a | yes |
 | <a name="input_node_pool_names"></a> [node\_pool\_names](#input\_node\_pool\_names) | If set to true. The node group VMs will have a random public IP assigned to it. Ignored if access\_config is set. | `list(string)` | n/a | yes |
 | <a name="input_nodeset_name"></a> [nodeset\_name](#input\_nodeset\_name) | The nodeset name | `string` | `"gkenodeset"` | no |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | The project ID to host the cluster in. | `string` | n/a | yes |
-| <a name="input_pvc_name"></a> [pvc\_name](#input\_pvc\_name) | An object that describes a k8s PVC created by this module. | `string` | n/a | yes |
 | <a name="input_slurm_bucket"></a> [slurm\_bucket](#input\_slurm\_bucket) | GCS Bucket of Slurm cluster file storage. | `any` | n/a | yes |
 | <a name="input_slurm_bucket_dir"></a> [slurm\_bucket\_dir](#input\_slurm\_bucket\_dir) | Path directory within `bucket_name` for Slurm cluster file storage. | `string` | n/a | yes |
 | <a name="input_slurm_cluster_name"></a> [slurm\_cluster\_name](#input\_slurm\_cluster\_name) | Cluster name, used in slurm controller | `string` | n/a | yes |

community/modules/compute/gke-nodeset/main.tf

@@ -34,7 +34,8 @@ module "kubectl_apply" {
       node_pool_name  = var.node_pool_names[0],
       node_count      = var.node_count_static,
       image           = var.image,
-      home_pvc        = var.pvc_name,
+      home_pvc        = module.home_pv.pvc_name
+      slurm_key_pvc   = module.slurm_key_pv.pvc_name
     }
   }]
 }

community/modules/compute/gke-nodeset/slurm_key.tf renamed to community/modules/compute/gke-nodeset/persistent_volumes.tf

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 locals {
-  network_storage = {
+  slurm_key_storage = {
     server_ip             = var.slurm_controller_instance.network_interface[0].network_ip
     remote_mount          = "/slurm/key_distribution" # defined in /community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/util.py
     client_install_runner = {}
@@ -31,7 +31,20 @@ module "slurm_key_pv" {
   cluster_id      = var.cluster_id
   filestore_id    = "projects/empty/locations/empty/instances/empty" # this does not apply since this NFS is not a filestore
   namespace       = var.slurm_namespace
-  network_storage = local.network_storage
+  network_storage = local.slurm_key_storage
   pv_name         = "slurm-key-pv"
   pvc_name        = "slurm-key-pvc"
 }
+
+# Assume the var.network_storage[0] will be home and only one home pv is accepted for now.
+module "home_pv" {
+  source          = "../../../../modules/file-system/gke-persistent-volume"
+  labels          = {}
+  capacity_gib    = 1024
+  cluster_id      = var.cluster_id
+  filestore_id    = var.filestore_id
+  network_storage = var.network_storage
+  namespace       = var.slurm_namespace
+  pv_name         = "home-pv"
+  pvc_name        = "home-pvc"
+}

community/modules/compute/gke-nodeset/templates/nodeset-general.yaml.tftpl

@@ -187,7 +187,7 @@ spec:
         name: run
       - name: slurm-config
         persistentVolumeClaim:
-          claimName: slurm-key-pvc
+          claimName: ${slurm_key_pvc}
       - emptyDir:
           medium: Memory
         name: slurm-spool

community/modules/compute/gke-nodeset/variables.tf

@@ -71,11 +71,6 @@ variable "nodeset_name" {
   default     = "gkenodeset"
 }
 
-variable "pvc_name" {
-  description = "An object that describes a k8s PVC created by this module."
-  type        = string
-}
-
 variable "slurm_bucket_dir" {
   description = "Path directory within `bucket_name` for Slurm cluster file storage."
   type        = string
@@ -93,3 +88,21 @@ variable "instance_templates" {
   type        = list(string)
   nullable    = false
 }
+
+variable "network_storage" {
+  description = "An array of network attached storage mounts to be configured on nodes."
+  type = object({
+    server_ip             = string,
+    remote_mount          = string,
+    local_mount           = string,
+    fs_type               = string,
+    mount_options         = string,
+    client_install_runner = map(string)
+    mount_runner          = map(string)
+  })
+}
+
+variable "filestore_id" {
+  description = "An array of identifier for a filestore with the format `projects/{{project}}/locations/{{location}}/instances/{{name}}`."
+  type        = string
+}