Skip to content

Commit 271af34

Browse files
DrFaust92DrFaust92
authored
fix: remove fuse csi driver from autopilot (#2218)
Signed-off-by: drfaust92 <[email protected]>
1 parent 2c32408 commit 271af34

File tree

33 files changed

+96
-137
lines changed

33 files changed

+96
-137
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,21 +344,21 @@ resource "google_container_cluster" "primary" {
344344
config_connector_config {
345345
enabled = var.config_connector
346346
}
347-
{% endif %}
348347

349-
dynamic "gke_backup_agent_config" {
350-
for_each = local.gke_backup_agent_config
348+
dynamic "gcs_fuse_csi_driver_config" {
349+
for_each = local.gcs_fuse_csi_driver_config
351350

352351
content {
353-
enabled = gke_backup_agent_config.value.enabled
352+
enabled = gcs_fuse_csi_driver_config.value.enabled
354353
}
355354
}
355+
{% endif %}
356356

357-
dynamic "gcs_fuse_csi_driver_config" {
358-
for_each = local.gcs_fuse_csi_driver_config
357+
dynamic "gke_backup_agent_config" {
358+
for_each = local.gke_backup_agent_config
359359

360360
content {
361-
enabled = gcs_fuse_csi_driver_config.value.enabled
361+
enabled = gke_backup_agent_config.value.enabled
362362
}
363363
}
364364

‎autogen/main/main.tf.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ locals {
107107
}]
108108
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
109109
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 }] : []
110111
{% endif %}
111112
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
112-
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
113113
stateful_ha_config = var.stateful_ha ? [{ enabled = true }] : []
114114
ray_operator_config = length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false)? [var.ray_operator_config]: []
115115
{% if beta_cluster and autopilot_cluster != true %}

‎autogen/main/variables.tf.tmpl‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -815,16 +815,15 @@ variable "gce_pd_csi_driver" {
815815
default = true
816816
}
817817

818-
{% endif %}
819-
variable "gke_backup_agent_config" {
818+
variable "gcs_fuse_csi_driver" {
820819
type = bool
821-
description = "Whether Backup for GKE agent is enabled for this cluster."
820+
description = "Whether GCE FUSE CSI driver is enabled for this cluster."
822821
default = false
823822
}
824-
825-
variable "gcs_fuse_csi_driver" {
823+
{% endif %}
824+
variable "gke_backup_agent_config" {
826825
type = bool
827-
description = "Whether GCE FUSE CSI driver is enabled for this cluster."
826+
description = "Whether Backup for GKE agent is enabled for this cluster."
828827
default = false
829828
}
830829

‎cluster.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,19 +269,19 @@ resource "google_container_cluster" "primary" {
269269
enabled = var.config_connector
270270
}
271271

272-
dynamic "gke_backup_agent_config" {
273-
for_each = local.gke_backup_agent_config
272+
dynamic "gcs_fuse_csi_driver_config" {
273+
for_each = local.gcs_fuse_csi_driver_config
274274

275275
content {
276-
enabled = gke_backup_agent_config.value.enabled
276+
enabled = gcs_fuse_csi_driver_config.value.enabled
277277
}
278278
}
279279

280-
dynamic "gcs_fuse_csi_driver_config" {
281-
for_each = local.gcs_fuse_csi_driver_config
280+
dynamic "gke_backup_agent_config" {
281+
for_each = local.gke_backup_agent_config
282282

283283
content {
284-
enabled = gcs_fuse_csi_driver_config.value.enabled
284+
enabled = gke_backup_agent_config.value.enabled
285285
}
286286
}
287287

‎examples/simple_autopilot_public/main.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ module "gke" {
4949
network_tags = [local.cluster_type]
5050
deletion_protection = false
5151
enable_l4_ilb_subsetting = true
52-
gcs_fuse_csi_driver = true
5352
stateful_ha = false
5453
gke_backup_agent_config = false
5554
ray_operator_config = {

‎main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ locals {
9090
}]
9191
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
9292
logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus != null
93-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
9493
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 }]
9595
stateful_ha_config = var.stateful_ha ? [{ enabled = true }] : []
9696
ray_operator_config = length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false) ? [var.ray_operator_config] : []
9797

‎modules/beta-autopilot-private-cluster/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ Then perform the following commands on the root folder:
108108
| fleet\_project\_grant\_service\_agent | (Optional) Grant the fleet project service identity the `roles/gkehub.serviceAgent` and `roles/gkehub.crossProjectServiceAgent` roles. | `bool` | `false` | no |
109109
| gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
110110
| gcp\_public\_cidrs\_access\_enabled | Allow access through Google Cloud public IP addresses | `bool` | `null` | no |
111-
| gcs\_fuse\_csi\_driver | Whether GCE FUSE CSI driver is enabled for this cluster. | `bool` | `false` | no |
112111
| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
113112
| grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
114113
| horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,6 @@ resource "google_container_cluster" "primary" {
178178
}
179179
}
180180

181-
dynamic "gcs_fuse_csi_driver_config" {
182-
for_each = local.gcs_fuse_csi_driver_config
183-
184-
content {
185-
enabled = gcs_fuse_csi_driver_config.value.enabled
186-
}
187-
}
188-
189181
dynamic "stateful_ha_config" {
190182
for_each = local.stateful_ha_config
191183

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@ locals {
6464
cluster_alias_ranges_cidr = var.add_cluster_firewall_rules ? { for range in toset(data.google_compute_subnetwork.gke_subnetwork[0].secondary_ip_range) : range.range_name => range.ip_cidr_range } : {}
6565
pod_all_ip_ranges = var.add_cluster_firewall_rules ? compact(concat([local.cluster_alias_ranges_cidr[var.ip_range_pods]], [for range in var.additional_ip_range_pods : local.cluster_alias_ranges_cidr[range] if length(range) > 0])) : []
6666

67-
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
68-
gcs_fuse_csi_driver_config = var.gcs_fuse_csi_driver ? [{ enabled = true }] : []
69-
stateful_ha_config = var.stateful_ha ? [{ enabled = true }] : []
70-
ray_operator_config = length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false) ? [var.ray_operator_config] : []
67+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
68+
stateful_ha_config = var.stateful_ha ? [{ enabled = true }] : []
69+
ray_operator_config = length(var.ray_operator_config) > 0 && lookup(var.ray_operator_config, "enabled", false) ? [var.ray_operator_config] : []
7170

7271
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
7372
security_group = var.authenticator_security_group

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -489,12 +489,6 @@ variable "gke_backup_agent_config" {
489489
default = false
490490
}
491491

492-
variable "gcs_fuse_csi_driver" {
493-
type = bool
494-
description = "Whether GCE FUSE CSI driver is enabled for this cluster."
495-
default = false
496-
}
497-
498492
variable "stateful_ha" {
499493
type = bool
500494
description = "Whether the Stateful HA Addon is enabled for this cluster."

0 commit comments

Comments
 (0)