Skip to content

Commit ab9d4cb

Browse files
DrFaust92DrFaust92
authored
feat: support parallelstore csi driver (#2203)
Signed-off-by: drfaust92 <[email protected]>
1 parent c492961 commit ab9d4cb

File tree

35 files changed

+180
-45
lines changed

35 files changed

+180
-45
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ Then perform the following commands on the root folder:
237237
| non\_masquerade\_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | `list(string)` | <pre>[<br> "10.0.0.0/8",<br> "172.16.0.0/12",<br> "192.168.0.0/16"<br>]</pre> | no |
238238
| notification\_config\_topic | The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}. | `string` | `""` | no |
239239
| notification\_filter\_event\_type | Choose what type of notifications you want to receive. If no filters are applied, you'll receive all notification types. Can be used to filter what notifications are sent. Accepted values are UPGRADE\_AVAILABLE\_EVENT, UPGRADE\_EVENT, and SECURITY\_BULLETIN\_EVENT. | `list(string)` | `[]` | no |
240+
| parallelstore\_csi\_driver | Whether the Parallelstore CSI driver Addon is enabled for this cluster. | `bool` | `null` | no |
240241
| project\_id | The project ID to host the cluster in (required) | `string` | n/a | yes |
241242
| ray\_operator\_config | The Ray Operator Addon configuration for this cluster. | <pre>object({<br> enabled = bool<br> logging_enabled = optional(bool, false)<br> monitoring_enabled = optional(bool, false)<br> })</pre> | <pre>{<br> "enabled": false,<br> "logging_enabled": false,<br> "monitoring_enabled": false<br>}</pre> | no |
242243
| region | The region to host the cluster in (optional if zonal cluster / required if regional) | `string` | `null` | no |

‎autogen/main/cluster.tf.tmpl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,16 @@ resource "google_container_cluster" "primary" {
410410
}
411411
}
412412

413+
{% if autopilot_cluster != true %}
414+
dynamic "parallelstore_csi_driver_config" {
415+
for_each = local.parallelstore_csi_driver_config
416+
417+
content {
418+
enabled = parallelstore_csi_driver_config.value.enabled
419+
}
420+
}
421+
{% endif %}
422+
413423
{% if beta_cluster and autopilot_cluster != true %}
414424
istio_config {
415425
disabled = !var.istio

‎autogen/main/main.tf.tmpl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,10 @@ locals {
105105
enabled = false
106106
provider = null
107107
}]
108-
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
109-
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus != null
110-
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
108+
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
109+
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus != null
110+
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
111+
parallelstore_csi_driver_config = var.parallelstore_csi_driver != null ? [{ enabled = var.parallelstore_csi_driver }] : []
111112
{% endif %}
112113
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
113114
stateful_ha_config = var.stateful_ha ? [{ enabled = true }] : []

‎autogen/main/variables.tf.tmpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -845,6 +845,14 @@ variable "stateful_ha" {
845845
default = false
846846
}
847847

848+
{% if autopilot_cluster != true %}
849+
variable "parallelstore_csi_driver" {
850+
type = bool
851+
description = "Whether the Parallelstore CSI driver Addon is enabled for this cluster."
852+
default = null
853+
}
854+
{% endif %}
855+
848856
variable "ray_operator_config" {
849857
type = object({
850858
enabled = bool

‎cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,14 @@ resource "google_container_cluster" "primary" {
316316
}
317317
}
318318

319+
dynamic "parallelstore_csi_driver_config" {
320+
for_each = local.parallelstore_csi_driver_config
321+
322+
content {
323+
enabled = parallelstore_csi_driver_config.value.enabled
324+
}
325+
}
326+
319327
}
320328

321329
datapath_provider = var.datapath_provider

‎main.tf

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ locals {
8888
enabled = false
8989
provider = null
9090
}]
91-
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
92-
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus != null
93-
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
94-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
95-
stateful_ha_config = var.stateful_ha ? [{ enabled = true }] : []
96-
ray_operator_config = length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false) ? [var.ray_operator_config] : []
91+
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
92+
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus != null
93+
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
94+
parallelstore_csi_driver_config = var.parallelstore_csi_driver != null ? [{ enabled = var.parallelstore_csi_driver }] : []
95+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
96+
stateful_ha_config = var.stateful_ha ? [{ enabled = true }] : []
97+
ray_operator_config = length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false) ? [var.ray_operator_config] : []
9798

9899
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
99100
security_group = var.authenticator_security_group

‎modules/beta-autopilot-private-cluster/cluster.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ resource "google_container_cluster" "primary" {
226226
}
227227
}
228228

229+
229230
}
230231

231232
allow_net_admin = var.allow_net_admin

‎modules/beta-autopilot-private-cluster/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,7 @@ variable "stateful_ha" {
516516
default = false
517517
}
518518

519+
519520
variable "ray_operator_config" {
520521
type = object({
521522
enabled = bool

‎modules/beta-autopilot-public-cluster/cluster.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ resource "google_container_cluster" "primary" {
226226
}
227227
}
228228

229+
229230
}
230231

231232
allow_net_admin = var.allow_net_admin

‎modules/beta-autopilot-public-cluster/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ variable "stateful_ha" {
480480
default = false
481481
}
482482

483+
483484
variable "ray_operator_config" {
484485
type = object({
485486
enabled = bool

0 commit comments

Comments
 (0)