Skip to content

Commit 68e8eec

Browse files
marko7460marko7460
authored
feat: add node_pool_taints to all the modules (#705)
1 parent f31b1f4 commit 68e8eec

File tree

57 files changed

+165
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+165
-55
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ Then perform the following commands on the root folder:
140140
| node\_pools\_metadata | Map of maps containing node metadata by node-pool name | map(map(string)) | `<map>` | no |
141141
| node\_pools\_oauth\_scopes | Map of lists containing node oauth scopes by node-pool name | map(list(string)) | `<map>` | no |
142142
| node\_pools\_tags | Map of lists containing node network tags by node-pool name | map(list(string)) | `<map>` | no |
143+
| node\_pools\_taints | Map of lists containing node taints by node-pool name | object | `<map>` | no |
143144
| non\_masquerade\_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | list(string) | `<list>` | no |
144145
| project\_id | The project ID to host the cluster in (required) | string | n/a | yes |
145146
| region | The region to host the cluster in (optional if zonal cluster / required if regional) | string | `"null"` | no |

‎autogen/main/cluster.tf.tmpl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,6 @@ resource "google_container_node_pool" "pools" {
458458
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
459459
},
460460
)
461-
{% if beta_cluster %}
462461
dynamic "taint" {
463462
for_each = concat(
464463
local.node_pools_taints["all"],
@@ -470,7 +469,6 @@ resource "google_container_node_pool" "pools" {
470469
value = taint.value.value
471470
}
472471
}
473-
{% endif %}
474472
tags = concat(
475473
lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
476474
lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-${each.value["name"]}"] : [],

‎autogen/main/variables.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ variable "cluster_autoscaling" {
227227
}
228228
description = "Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling)"
229229
}
230+
{% endif %}
230231

231232
variable "node_pools_taints" {
232233
type = map(list(object({ key = string, value = string, effect = string })))
@@ -239,7 +240,6 @@ variable "node_pools_taints" {
239240
}
240241
}
241242

242-
{% endif %}
243243
variable "node_pools_tags" {
244244
type = map(list(string))
245245
description = "Map of lists containing node network tags by node-pool name"

‎autogen/main/variables_defaults.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ locals {
4040
var.node_pools_metadata
4141
)
4242

43-
{% if beta_cluster %}
4443
node_pools_taints = merge(
4544
{ all = [] },
4645
{ default-node-pool = [] },
@@ -51,7 +50,6 @@ locals {
5150
var.node_pools_taints
5251
)
5352

54-
{% endif %}
5553
node_pools_tags = merge(
5654
{ all = [] },
5755
{ default-node-pool = [] },

‎cluster.tf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,17 @@ resource "google_container_node_pool" "pools" {
198198
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
199199
},
200200
)
201+
dynamic "taint" {
202+
for_each = concat(
203+
local.node_pools_taints["all"],
204+
local.node_pools_taints[each.value["name"]],
205+
)
206+
content {
207+
effect = taint.value.effect
208+
key = taint.value.key
209+
value = taint.value.value
210+
}
211+
}
201212
tags = concat(
202213
lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
203214
lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-${each.value["name"]}"] : [],

‎examples/deploy_service/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/disable_client_cert/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/node_pool/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/node_pool_update_variant/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/node_pool_update_variant_beta/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
credentials = file(var.credentials_path)
2424
region = var.region
2525
}

‎examples/private_zonal_with_networking/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
module "gcp-network" {
1818
source = "terraform-google-modules/network/google"
19-
version = "~> 2.0"
19+
version = "~> 2.5"
2020
project_id = var.project_id
2121
network_name = var.network
2222

‎examples/regional_private_node_pool_oauth_scopes/network.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
module "gke-network" {
1818
source = "terraform-google-modules/network/google"
19-
version = "~> 2.0"
19+
version = "~> 2.5"
2020
project_id = var.project_id
2121
network_name = "random-gke-network"
2222

‎examples/regional_private_node_pool_oauth_scopes/provider.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616

1717
provider "google" {
18-
version = "~> 3.35.0"
18+
version = "~> 3.42.0"
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
}

‎examples/safer_cluster/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ locals {
3030
}
3131

3232
provider "google" {
33-
version = "~> 3.35.0"
33+
version = "~> 3.42.0"
3434
}
3535

3636
provider "google-beta" {
37-
version = "~> 3.35.0"
37+
version = "~> 3.42.0"
3838
}
3939

4040
module "gke" {

‎examples/safer_cluster/network.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
module "gcp-network" {
1818
source = "terraform-google-modules/network/google"
19-
version = "~> 2.0"
19+
version = "~> 2.5"
2020
project_id = var.project_id
2121
network_name = local.network_name
2222

‎examples/safer_cluster_iap_bastion/network.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
module "vpc" {
1919
source = "terraform-google-modules/network/google"
20-
version = "~> 2.3"
20+
version = "~> 2.5"
2121

2222
project_id = module.enabled_google_apis.project_id
2323
network_name = var.network_name

‎examples/safer_cluster_iap_bastion/provider.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616

1717
provider "google" {
18-
version = "~> 3.35.0"
18+
version = "~> 3.42.0"
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
}

‎examples/shared_vpc/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_regional/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_regional_beta/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_regional_private/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_regional_private_beta/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

2626
provider "google-beta" {
27-
version = "~> 3.35.0"
27+
version = "~> 3.42.0"
2828
region = var.region
2929
}
3030

‎examples/simple_regional_with_kubeconfig/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_regional_with_networking/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616

1717
provider "google" {
18-
version = "~> 3.35.0"
18+
version = "~> 3.42.0"
1919
}
2020

2121
module "gcp-network" {
2222
source = "terraform-google-modules/network/google"
23-
version = "~> 2.0"
23+
version = "~> 2.5"
2424
project_id = var.project_id
2525
network_name = var.network
2626

‎examples/simple_zonal_private/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_zonal_with_acm/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_zonal_with_asm/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/simple_zonal_with_hub/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.16.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/stub_domains/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/stub_domains_private/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
provider "google" {
18-
version = "~> 3.35.0"
18+
version = "~> 3.42.0"
1919
region = var.region
2020
}
2121

‎examples/stub_domains_upstream_nameservers/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/upstream_nameservers/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/workload_identity/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎examples/workload_metadata_config/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ locals {
1919
}
2020

2121
provider "google-beta" {
22-
version = "~> 3.35.0"
22+
version = "~> 3.42.0"
2323
region = var.region
2424
}
2525

‎modules/private-cluster-update-variant/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Then perform the following commands on the root folder:
172172
| node\_pools\_metadata | Map of maps containing node metadata by node-pool name | map(map(string)) | `<map>` | no |
173173
| node\_pools\_oauth\_scopes | Map of lists containing node oauth scopes by node-pool name | map(list(string)) | `<map>` | no |
174174
| node\_pools\_tags | Map of lists containing node network tags by node-pool name | map(list(string)) | `<map>` | no |
175+
| node\_pools\_taints | Map of lists containing node taints by node-pool name | object | `<map>` | no |
175176
| non\_masquerade\_cidrs | List of strings in CIDR notation that specify the IP address ranges that do not use IP masquerading. | list(string) | `<list>` | no |
176177
| project\_id | The project ID to host the cluster in (required) | string | n/a | yes |
177178
| region | The region to host the cluster in (optional if zonal cluster / required if regional) | string | `"null"` | no |

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,17 @@ resource "google_container_node_pool" "pools" {
283283
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
284284
},
285285
)
286+
dynamic "taint" {
287+
for_each = concat(
288+
local.node_pools_taints["all"],
289+
local.node_pools_taints[each.value["name"]],
290+
)
291+
content {
292+
effect = taint.value.effect
293+
key = taint.value.key
294+
value = taint.value.value
295+
}
296+
}
286297
tags = concat(
287298
lookup(local.node_pools_tags, "default_values", [true, true])[0] ? [local.cluster_network_tag] : [],
288299
lookup(local.node_pools_tags, "default_values", [true, true])[1] ? ["${local.cluster_network_tag}-${each.value["name"]}"] : [],

0 commit comments

Comments
 (0)