Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Node Pool enable_gcfs true:false #1976

Merged
merged 20 commits into from
Sep 11, 2024
Merged

fix: Node Pool enable_gcfs true:false #1976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
38f72f9
Update cluster.tf
psiegmannyardi Jun 12, 2024
821ee72
Merge branch 'master' into patch-1
psiegmannyardi Jun 13, 2024
b90edde
using autogen
psiegmannyardi Jun 13, 2024
fbc3bf9
Merge branch 'master' into patch-1
psiegmannyardi Jun 19, 2024
25e96ae
Merge branch 'master' into patch-1
apeabody Jun 22, 2024
0b1816d
Merge branch 'master' into patch-1
psiegmannyardi Jun 25, 2024
ecbb3b7
revert examples
psiegmannyardi Jun 25, 2024
07e4117
Merge branch 'patch-1' of https://github.com/psiegmannyardi/terraform…
psiegmannyardi Jun 25, 2024
95a6920
Merge branch 'master' into patch-1
psiegmannyardi Jul 8, 2024
930c806
Merge branch 'master' into patch-1
psiegmannyardi Jul 9, 2024
5e9170d
Merge branch 'master' into patch-1
psiegmannyardi Jul 22, 2024
e00a616
Merge branch 'master' into patch-1
psiegmannyardi Jul 22, 2024
f44eb84
Merge branch 'master' into patch-1
apeabody Jul 24, 2024
54b7f63
Merge branch 'master' into patch-1
psiegmannyardi Jul 29, 2024
ee32011
add "gcfsConfig" to testdata
apeabody Aug 19, 2024
f7036c8
Merge branch 'master' into patch-1
apeabody Aug 19, 2024
ff2dac3
Merge branch 'master' into patch-1
apeabody Sep 3, 2024
a6f07e1
Merge branch 'master' into patch-1
apeabody Sep 4, 2024
6a1740b
Merge branch 'master' into patch-1
apeabody Sep 6, 2024
cdfbbe0
Merge branch 'master' into patch-1
apeabody Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -887,7 +887,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
6 changes: 3 additions & 3 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -593,7 +593,7 @@ resource "google_container_node_pool" "pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -875,7 +875,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_regional_with_ipv6/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ provider "kubernetes" {
}

module "gke" {
source = "../../"
source = "terraform-google-modules/kubernetes-engine/google"
project_id = var.project_id
name = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
regional = true
Expand Down
6 changes: 3 additions & 3 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -760,7 +760,7 @@ resource "google_container_node_pool" "pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -1056,7 +1056,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
6 changes: 3 additions & 3 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -678,7 +678,7 @@ resource "google_container_node_pool" "pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -973,7 +973,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
6 changes: 3 additions & 3 deletions modules/beta-public-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -739,7 +739,7 @@ resource "google_container_node_pool" "pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -1035,7 +1035,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
6 changes: 3 additions & 3 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -657,7 +657,7 @@ resource "google_container_node_pool" "pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -952,7 +952,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
6 changes: 3 additions & 3 deletions modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -696,7 +696,7 @@ resource "google_container_node_pool" "pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -979,7 +979,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
6 changes: 3 additions & 3 deletions modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ resource "google_container_cluster" "primary" {
min_cpu_platform = lookup(var.node_pools[0], "min_cpu_platform", "")
enable_confidential_storage = lookup(var.node_pools[0], "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : []
for_each = lookup(var.node_pools[0], "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -614,7 +614,7 @@ resource "google_container_node_pool" "pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down Expand Up @@ -896,7 +896,7 @@ resource "google_container_node_pool" "windows_pools" {
min_cpu_platform = lookup(each.value, "min_cpu_platform", "")
enable_confidential_storage = lookup(each.value, "enable_confidential_storage", false)
dynamic "gcfs_config" {
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : []
for_each = lookup(each.value, "enable_gcfs", false) ? [true] : [false]
content {
enabled = gcfs_config.value
}
Expand Down
1 change: 1 addition & 0 deletions test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
"config": {
"diskSizeGb": 100,
"diskType": "pd-standard",
"gcfsConfig": {},
"imageType": "COS_CONTAINERD",
"labels": {
"cluster_name": "CLUSTER_NAME",
Expand Down