File tree 7 files changed +21
-9
lines changed
7 files changed +21
-9
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ resource "aws_eip" "nat_gw" {
40
40
41
41
tags = local. eks_metadata_tags
42
42
43
- vpc = true
43
+ domain = " vpc "
44
44
}
45
45
46
46
resource "aws_nat_gateway" "current" {
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ resource "azuread_application" "current" {
7
7
resource "azuread_service_principal" "current" {
8
8
count = var. disable_managed_identities == true ? 1 : 0
9
9
10
- application_id = azuread_application. current [0 ]. application_id
10
+ client_id = azuread_application. current [0 ]. client_id
11
11
}
12
12
13
13
resource "azuread_service_principal_password" "current" {
Original file line number Diff line number Diff line change @@ -49,7 +49,15 @@ resource "google_container_node_pool" "current" {
49
49
}
50
50
}
51
51
52
- taint = var. taint
52
+ dynamic "taint" {
53
+ for_each = var. taints == null ? [] : var. taints
54
+
55
+ content {
56
+ key = taint. key
57
+ value = taint. value
58
+ effect = taint. effect
59
+ }
60
+ }
53
61
}
54
62
55
63
management {
Original file line number Diff line number Diff line change @@ -109,10 +109,14 @@ variable "node_workload_metadata_config" {
109
109
type = string
110
110
}
111
111
112
- variable "taint" {
112
+ variable "taints" {
113
+ type = set (object ({
114
+ key = string
115
+ value = string
116
+ effect = string
117
+ }))
113
118
description = " Taints to configure for the node pool."
114
- type = list (any )
115
- default = []
119
+ default = null
116
120
}
117
121
118
122
variable "node_locations" {
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ locals {
30
30
auto_repair = local. cfg [" auto_repair" ] != null ? local. cfg [" auto_repair" ] : true
31
31
auto_upgrade = local. cfg [" auto_upgrade" ] != null ? local. cfg [" auto_upgrade" ] : true
32
32
33
- taint = local. cfg [" taint " ]
33
+ taints = local. cfg [" taints " ]
34
34
35
35
extra_oauth_scopes = local. cfg [" extra_oauth_scopes" ] != null ? local. cfg [" extra_oauth_scopes" ] : []
36
36
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ module "node_pool" {
30
30
31
31
node_workload_metadata_config = local. node_workload_metadata_config
32
32
33
- taint = local. taint
33
+ taints = local. taints
34
34
35
35
service_account_email = local. service_account_email
36
36
disable_per_node_pool_service_account = local. service_account_email == null ? false : true
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ variable "configuration" {
21
21
auto_repair = optional (bool )
22
22
auto_upgrade = optional (bool )
23
23
24
- taint = optional (set (object ({
24
+ taints = optional (set (object ({
25
25
key = string
26
26
value = string
27
27
effect = string
You can’t perform that action at this time.
0 commit comments