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

Jump to bottom

Fix typo in GKE nodepool taints #1754

Merged
merged 4 commits into from
Oct 12, 2023
Merged

Fix typo in GKE nodepool taints #1754

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7a9652
Fix typo in GKE nodepool taints
ludoo Oct 12, 2023
0dfe92c
Merge branch 'master' into ludoo/issue-1749
ludoo Oct 12, 2023
521bbe0
Merge branch 'master' into ludoo/issue-1749
ludoo Oct 12, 2023
872f4e4
fix windows taints
ludoo Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 8 additions & 9 deletions modules/gke-nodepool/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ locals {
"https://www.googleapis.com/auth/userinfo.email"
]
)
taints_windows = (
local.image.is_win
? [{
key = "node.kubernetes.io/os", value = "windows", effect = "NO_EXECUTE"
}]
: []
)
taints = merge(var.taints, !local.image.is_win ? {} : {
"node.kubernetes.io/os" = {
value = "windows"
effect = "NO_EXECUTE"
}
})
}

resource "google_service_account" "service_account" {
Expand Down Expand Up @@ -215,11 +214,11 @@ resource "google_container_node_pool" "nodepool" {
}
}
dynamic "taint" {
for_each = var.taints
for_each = local.taints
content {
wiktorn marked this conversation as resolved.
Show resolved Hide resolved
key = taint.key
value = taint.value.value
effect = taint.effect
effect = taint.value.effect
}
}
dynamic "workload_metadata_config" {
Expand Down