Skip to content

Commit 731139f

Browse files
committed
feat(main): take node_config_defaults out of beta
`node_config_defaults` is GA in all our supported versions
1 parent 151274e commit 731139f

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,6 @@ resource "google_container_cluster" "primary" {
660660
}
661661
}
662662
}
663-
{% if beta_cluster %}
664663

665664
node_pool_defaults {
666665
node_config_defaults {
@@ -680,7 +679,6 @@ resource "google_container_cluster" "primary" {
680679
{% endif %}
681680
}
682681
}
683-
{% endif %}
684682
{% if beta_cluster %}
685683

686684
depends_on = [google_project_iam_member.service_agent]

cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,14 @@ resource "google_container_cluster" "primary" {
499499
}
500500
}
501501
}
502+
503+
node_pool_defaults {
504+
node_config_defaults {
505+
gcfs_config {
506+
enabled = var.enable_gcfs
507+
}
508+
}
509+
}
502510
}
503511
/******************************************
504512
Create Container Cluster node pools

modules/private-cluster-update-variant/cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,14 @@ resource "google_container_cluster" "primary" {
520520
}
521521
}
522522
}
523+
524+
node_pool_defaults {
525+
node_config_defaults {
526+
gcfs_config {
527+
enabled = var.enable_gcfs
528+
}
529+
}
530+
}
523531
}
524532
/******************************************
525533
Create Container Cluster node pools

modules/private-cluster/cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,14 @@ resource "google_container_cluster" "primary" {
520520
}
521521
}
522522
}
523+
524+
node_pool_defaults {
525+
node_config_defaults {
526+
gcfs_config {
527+
enabled = var.enable_gcfs
528+
}
529+
}
530+
}
523531
}
524532
/******************************************
525533
Create Container Cluster node pools

0 commit comments

Comments
 (0)