Skip to content

feat(TPG>=7.17)!: add support for node_drain_config #2535

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

Merged
apeabody merged 2 commits into from
Feb 3, 2026
Merged

feat(TPG>=7.17)!: add support for node_drain_config #2535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa868c2
ad support for node_drain_config
DrFaust92 Jan 31, 2026
4a062c9
ad support for node_drain_config
DrFaust92 Jan 31, 2026
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
1 change: 1 addition & 0 deletions autogen/main/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ The node_pools variable takes the following parameters:
| local_ssd_encryption_mode | specifies the method used for encrypting the local SSDs attached to the node. Valid values are: "STANDARD_ENCRYPTION" and "EPHEMERAL_KEY_ENCRYPTION" | | Optional |
| max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
| respect_pdb_during_node_pool_deletion | Whether to respect Pod Disruption Budgets during node pool deletion. | null | Optional |

## windows_node_pools variable

Expand Down
7 changes: 7 additions & 0 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down
12 changes: 6 additions & 6 deletions autogen/main/versions.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,33 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
{% elif beta_cluster and autopilot_cluster %}
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
{% elif autopilot_cluster %}
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
{% else %}
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
{% endif %}
kubernetes = {
Expand Down
14 changes: 14 additions & 0 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down Expand Up @@ -1157,6 +1164,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down
2 changes: 1 addition & 1 deletion metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ spec:
- roles/editor
providerVersions:
- source: hashicorp/google
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/kubernetes
version: ">= 2.10, < 4"
- source: hashicorp/random
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-autopilot-private-cluster/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,9 +609,9 @@ spec:
- roles/editor
providerVersions:
- source: hashicorp/google
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/google-beta
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/kubernetes
version: ">= 2.10, < 4"
- source: hashicorp/random
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-autopilot-private-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-autopilot-public-cluster/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,9 +583,9 @@ spec:
- roles/editor
providerVersions:
- source: hashicorp/google
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/google-beta
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/kubernetes
version: ">= 2.10, < 4"
- source: hashicorp/random
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-autopilot-public-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
14 changes: 14 additions & 0 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 @@ -921,6 +921,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down Expand Up @@ -1315,6 +1322,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-private-cluster-update-variant/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,9 +904,9 @@ spec:
- roles/editor
providerVersions:
- source: hashicorp/google
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/google-beta
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/kubernetes
version: ">= 2.10, < 4"
- source: hashicorp/random
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-private-cluster-update-variant/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
14 changes: 14 additions & 0 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down Expand Up @@ -1228,6 +1235,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-private-cluster/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,9 +904,9 @@ spec:
- roles/editor
providerVersions:
- source: hashicorp/google
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/google-beta
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/kubernetes
version: ">= 2.10, < 4"
- source: hashicorp/random
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-private-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
14 changes: 14 additions & 0 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 @@ -899,6 +899,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down Expand Up @@ -1293,6 +1300,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-public-cluster-update-variant/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,9 +878,9 @@ spec:
- roles/editor
providerVersions:
- source: hashicorp/google
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/google-beta
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/kubernetes
version: ">= 2.10, < 4"
- source: hashicorp/random
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-public-cluster-update-variant/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
14 changes: 14 additions & 0 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,13 @@ resource "google_container_node_pool" "pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down Expand Up @@ -1206,6 +1213,13 @@ resource "google_container_node_pool" "windows_pools" {
}
}

dynamic "node_drain_config" {
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
content {
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
}
}

management {
auto_repair = lookup(each.value, "auto_repair", true)
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-public-cluster/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,9 +878,9 @@ spec:
- roles/editor
providerVersions:
- source: hashicorp/google
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/google-beta
version: ">= 7.10.0, < 8"
version: ">= 7.17.0, < 8"
- source: hashicorp/kubernetes
version: ">= 2.10, < 4"
- source: hashicorp/random
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-public-cluster/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
google-beta = {
source = "hashicorp/google-beta"
version = ">= 7.10.0, < 8"
version = ">= 7.17.0, < 8"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion modules/gke-node-pool/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,9 @@ spec:
roles:
- level: Project
roles:
- roles/compute.admin
- roles/container.admin
- roles/iam.serviceAccountUser
- roles/compute.admin
services:
- compute.googleapis.com
- container.googleapis.com
Expand Down
2 changes: 1 addition & 1 deletion modules/gke-standard-cluster/metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,9 +1125,9 @@ spec:
roles:
- level: Project
roles:
- roles/iam.serviceAccountUser
- roles/compute.admin
- roles/container.admin
- roles/iam.serviceAccountUser
services:
- compute.googleapis.com
- container.googleapis.com
Expand Down
Loading
Loading