Skip to content

Commit aa868c2

Browse files
DrFaust92DrFaust92
committed
ad support for node_drain_config
Signed-off-by: drfaust92 <[email protected]>
1 parent fd35a85 commit aa868c2

File tree

30 files changed

+144
-38
lines changed

30 files changed

+144
-38
lines changed

‎autogen/main/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ The node_pools variable takes the following parameters:
288288
| 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 |
289289
| max_run_duration | The runtime of each node in the node pool in seconds, terminated by 's'. Example: "3600s". | null | Optional |
290290
| flex_start | Enables Flex Start provisioning model for the node pool | null | Optional |
291+
| respect_pdb_during_node_pool_deletion | Whether to respect Pod Disruption Budgets during node pool deletion. | null | Optional |
291292

292293
## windows_node_pools variable
293294

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,13 @@ resource "google_container_node_pool" "windows_pools" {
10681068
}
10691069
}
10701070

1071+
dynamic "node_drain_config" {
1072+
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
1073+
content {
1074+
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
1075+
}
1076+
}
1077+
10711078
management {
10721079
auto_repair = lookup(each.value, "auto_repair", true)
10731080
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)

‎autogen/main/versions.tf.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,33 +24,33 @@ terraform {
2424
required_providers {
2525
google = {
2626
source = "hashicorp/google"
27-
version = ">= 7.10.0, < 8"
27+
version = ">= 7.17.0, < 8"
2828
}
2929
google-beta = {
3030
source = "hashicorp/google-beta"
31-
version = ">= 7.10.0, < 8"
31+
version = ">= 7.17.0, < 8"
3232
}
3333
{% elif beta_cluster and autopilot_cluster %}
3434
required_providers {
3535
google = {
3636
source = "hashicorp/google"
37-
version = ">= 7.10.0, < 8"
37+
version = ">= 7.17.0, < 8"
3838
}
3939
google-beta = {
4040
source = "hashicorp/google-beta"
41-
version = ">= 7.10.0, < 8"
41+
version = ">= 7.17.0, < 8"
4242
}
4343
{% elif autopilot_cluster %}
4444
required_providers {
4545
google = {
4646
source = "hashicorp/google"
47-
version = ">= 7.10.0, < 8"
47+
version = ">= 7.17.0, < 8"
4848
}
4949
{% else %}
5050
required_providers {
5151
google = {
5252
source = "hashicorp/google"
53-
version = ">= 7.10.0, < 8"
53+
version = ">= 7.17.0, < 8"
5454
}
5555
{% endif %}
5656
kubernetes = {

‎cluster.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,13 @@ resource "google_container_node_pool" "pools" {
777777
}
778778
}
779779

780+
dynamic "node_drain_config" {
781+
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
782+
content {
783+
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
784+
}
785+
}
786+
780787
management {
781788
auto_repair = lookup(each.value, "auto_repair", true)
782789
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
@@ -1157,6 +1164,13 @@ resource "google_container_node_pool" "windows_pools" {
11571164
}
11581165
}
11591166

1167+
dynamic "node_drain_config" {
1168+
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
1169+
content {
1170+
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
1171+
}
1172+
}
1173+
11601174
management {
11611175
auto_repair = lookup(each.value, "auto_repair", true)
11621176
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)

‎metadata.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ spec:
883883
- roles/editor
884884
providerVersions:
885885
- source: hashicorp/google
886-
version: ">= 7.10.0, < 8"
886+
version: ">= 7.17.0, < 8"
887887
- source: hashicorp/kubernetes
888888
version: ">= 2.10, < 4"
889889
- source: hashicorp/random

‎modules/beta-autopilot-private-cluster/metadata.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,9 +609,9 @@ spec:
609609
- roles/editor
610610
providerVersions:
611611
- source: hashicorp/google
612-
version: ">= 7.10.0, < 8"
612+
version: ">= 7.17.0, < 8"
613613
- source: hashicorp/google-beta
614-
version: ">= 7.10.0, < 8"
614+
version: ">= 7.17.0, < 8"
615615
- source: hashicorp/kubernetes
616616
version: ">= 2.10, < 4"
617617
- source: hashicorp/random

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 7.10.0, < 8"
24+
version = ">= 7.17.0, < 8"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 7.10.0, < 8"
28+
version = ">= 7.17.0, < 8"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

‎modules/beta-autopilot-public-cluster/metadata.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,9 @@ spec:
583583
- roles/editor
584584
providerVersions:
585585
- source: hashicorp/google
586-
version: ">= 7.10.0, < 8"
586+
version: ">= 7.17.0, < 8"
587587
- source: hashicorp/google-beta
588-
version: ">= 7.10.0, < 8"
588+
version: ">= 7.17.0, < 8"
589589
- source: hashicorp/kubernetes
590590
version: ">= 2.10, < 4"
591591
- source: hashicorp/random

‎modules/beta-autopilot-public-cluster/versions.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ terraform {
2121
required_providers {
2222
google = {
2323
source = "hashicorp/google"
24-
version = ">= 7.10.0, < 8"
24+
version = ">= 7.17.0, < 8"
2525
}
2626
google-beta = {
2727
source = "hashicorp/google-beta"
28-
version = ">= 7.10.0, < 8"
28+
version = ">= 7.17.0, < 8"
2929
}
3030
kubernetes = {
3131
source = "hashicorp/kubernetes"

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,13 @@ resource "google_container_node_pool" "pools" {
921921
}
922922
}
923923

924+
dynamic "node_drain_config" {
925+
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
926+
content {
927+
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
928+
}
929+
}
930+
924931
management {
925932
auto_repair = lookup(each.value, "auto_repair", true)
926933
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)
@@ -1315,6 +1322,13 @@ resource "google_container_node_pool" "windows_pools" {
13151322
}
13161323
}
13171324

1325+
dynamic "node_drain_config" {
1326+
for_each = lookup(each.value, "respect_pdb_during_node_pool_deletion", null) != null ? [each.value] : []
1327+
content {
1328+
respect_pdb_during_node_pool_deletion = lookup(each.value, "respect_pdb_during_node_pool_deletion", null)
1329+
}
1330+
}
1331+
13181332
management {
13191333
auto_repair = lookup(each.value, "auto_repair", true)
13201334
auto_upgrade = lookup(each.value, "auto_upgrade", local.default_auto_upgrade)

0 commit comments

Comments
 (0)