Skip to content

Commit 6c5e992

Browse files
richardmcsongrichardmcsong
committed
updates
1 parent 4f15f0f commit 6c5e992

File tree

13 files changed

+36
-25
lines changed

13 files changed

+36
-25
lines changed

‎autogen/cluster_regional.tf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ resource "google_container_cluster" "primary" {
3131
description = var.description
3232
project = var.project_id
3333
resource_labels = var.cluster_resource_labels
34-
default_max_pods_per_node = var.default_max_pods_per_node
3534

3635
region = var.region
3736
node_locations = coalescelist(
@@ -60,6 +59,7 @@ resource "google_container_cluster" "primary" {
6059
{% if beta_cluster %}
6160
enable_binary_authorization = var.enable_binary_authorization
6261
enable_intranode_visibility = var.enable_intranode_visibility
62+
default_max_pods_per_node = var.default_max_pods_per_node
6363

6464
vertical_pod_autoscaling {
6565
enabled = var.enable_vertical_pod_autoscaling
@@ -209,7 +209,9 @@ resource "google_container_node_pool" "pools" {
209209
"initial_node_count",
210210
lookup(var.node_pools[count.index], "min_count", 1),
211211
)
212+
{% if beta_cluster %}
212213
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
214+
{% endif %}
213215

214216
autoscaling {
215217
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)

‎autogen/cluster_zonal.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ resource "google_container_cluster" "zonal_primary" {
5555
{% if beta_cluster %}
5656
enable_binary_authorization = var.enable_binary_authorization
5757
enable_intranode_visibility = var.enable_intranode_visibility
58-
58+
default_max_pods_per_node = var.default_max_pods_per_node
59+
5960
vertical_pod_autoscaling {
6061
enabled = var.enable_vertical_pod_autoscaling
6162
}
@@ -204,8 +205,9 @@ resource "google_container_node_pool" "zonal_pools" {
204205
"initial_node_count",
205206
lookup(var.node_pools[count.index], "min_count", 1),
206207
)
208+
{% if beta_cluster %}
207209
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
208-
210+
{% endif %}
209211
autoscaling {
210212
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
211213
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)

‎autogen/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,11 @@ variable "istio" {
323323
default = false
324324
}
325325

326+
variable "default_max_pods_per_node" {
327+
description = "The maximum number of pods to schedule per node"
328+
default = 110
329+
}
330+
326331
variable "database_encryption" {
327332
description = "Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: \"ENCRYPTED\"; \"DECRYPTED\". key_name is the name of a CloudKMS key."
328333
type = list(object({state = string, key_name = string}))

‎cluster_regional.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ resource "google_container_cluster" "primary" {
2727
description = var.description
2828
project = var.project_id
2929
resource_labels = var.cluster_resource_labels
30-
default_max_pods_per_node = var.default_max_pods_per_node
3130

3231
region = var.region
3332
node_locations = coalescelist(
@@ -146,7 +145,6 @@ resource "google_container_node_pool" "pools" {
146145
"initial_node_count",
147146
lookup(var.node_pools[count.index], "min_count", 1),
148147
)
149-
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
150148

151149
autoscaling {
152150
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)

‎cluster_zonal.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ resource "google_container_node_pool" "zonal_pools" {
142142
"initial_node_count",
143143
lookup(var.node_pools[count.index], "min_count", 1),
144144
)
145-
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
146-
147145
autoscaling {
148146
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
149147
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)

‎modules/beta-private-cluster/cluster_regional.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
resource "google_container_cluster" "primary" {
2323
provider = google-beta
2424

25-
count = var.regional ? 1 : 0
26-
name = var.name
27-
description = var.description
28-
project = var.project_id
29-
resource_labels = var.cluster_resource_labels
30-
default_max_pods_per_node = var.default_max_pods_per_node
25+
count = var.regional ? 1 : 0
26+
name = var.name
27+
description = var.description
28+
project = var.project_id
29+
resource_labels = var.cluster_resource_labels
3130

3231
region = var.region
3332
node_locations = coalescelist(
@@ -55,6 +54,7 @@ resource "google_container_cluster" "primary" {
5554

5655
enable_binary_authorization = var.enable_binary_authorization
5756
enable_intranode_visibility = var.enable_intranode_visibility
57+
default_max_pods_per_node = var.default_max_pods_per_node
5858

5959
vertical_pod_autoscaling {
6060
enabled = var.enable_vertical_pod_autoscaling

‎modules/beta-private-cluster/cluster_zonal.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ resource "google_container_cluster" "zonal_primary" {
5050

5151
enable_binary_authorization = var.enable_binary_authorization
5252
enable_intranode_visibility = var.enable_intranode_visibility
53+
default_max_pods_per_node = var.default_max_pods_per_node
5354

5455
vertical_pod_autoscaling {
5556
enabled = var.enable_vertical_pod_autoscaling
@@ -191,7 +192,6 @@ resource "google_container_node_pool" "zonal_pools" {
191192
lookup(var.node_pools[count.index], "min_count", 1),
192193
)
193194
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
194-
195195
autoscaling {
196196
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
197197
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)

‎modules/beta-private-cluster/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,11 @@ variable "istio" {
320320
default = false
321321
}
322322

323+
variable "default_max_pods_per_node" {
324+
description = "The maximum number of pods to schedule per node"
325+
default = 110
326+
}
327+
323328
variable "database_encryption" {
324329
description = "Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: \"ENCRYPTED\"; \"DECRYPTED\". key_name is the name of a CloudKMS key."
325330
type = list(object({ state = string, key_name = string }))

‎modules/beta-public-cluster/cluster_regional.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
resource "google_container_cluster" "primary" {
2323
provider = google-beta
2424

25-
count = var.regional ? 1 : 0
26-
name = var.name
27-
description = var.description
28-
project = var.project_id
29-
resource_labels = var.cluster_resource_labels
30-
default_max_pods_per_node = var.default_max_pods_per_node
25+
count = var.regional ? 1 : 0
26+
name = var.name
27+
description = var.description
28+
project = var.project_id
29+
resource_labels = var.cluster_resource_labels
3130

3231
region = var.region
3332
node_locations = coalescelist(
@@ -55,6 +54,7 @@ resource "google_container_cluster" "primary" {
5554

5655
enable_binary_authorization = var.enable_binary_authorization
5756
enable_intranode_visibility = var.enable_intranode_visibility
57+
default_max_pods_per_node = var.default_max_pods_per_node
5858

5959
vertical_pod_autoscaling {
6060
enabled = var.enable_vertical_pod_autoscaling

‎modules/beta-public-cluster/cluster_zonal.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ resource "google_container_cluster" "zonal_primary" {
5050

5151
enable_binary_authorization = var.enable_binary_authorization
5252
enable_intranode_visibility = var.enable_intranode_visibility
53+
default_max_pods_per_node = var.default_max_pods_per_node
5354

5455
vertical_pod_autoscaling {
5556
enabled = var.enable_vertical_pod_autoscaling
@@ -186,7 +187,6 @@ resource "google_container_node_pool" "zonal_pools" {
186187
lookup(var.node_pools[count.index], "min_count", 1),
187188
)
188189
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
189-
190190
autoscaling {
191191
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
192192
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)

‎modules/beta-public-cluster/variables.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,11 @@ variable "istio" {
296296
default = false
297297
}
298298

299+
variable "default_max_pods_per_node" {
300+
description = "The maximum number of pods to schedule per node"
301+
default = 110
302+
}
303+
299304
variable "database_encryption" {
300305
description = "Application-layer Secrets Encryption settings. The object format is {state = string, key_name = string}. Valid values of state are: \"ENCRYPTED\"; \"DECRYPTED\". key_name is the name of a CloudKMS key."
301306
type = list(object({ state = string, key_name = string }))

‎modules/private-cluster/cluster_regional.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ resource "google_container_cluster" "primary" {
2727
description = var.description
2828
project = var.project_id
2929
resource_labels = var.cluster_resource_labels
30-
default_max_pods_per_node = var.default_max_pods_per_node
3130

3231
region = var.region
3332
node_locations = coalescelist(
@@ -152,7 +151,6 @@ resource "google_container_node_pool" "pools" {
152151
"initial_node_count",
153152
lookup(var.node_pools[count.index], "min_count", 1),
154153
)
155-
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
156154

157155
autoscaling {
158156
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)

‎modules/private-cluster/cluster_zonal.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ resource "google_container_node_pool" "zonal_pools" {
147147
"initial_node_count",
148148
lookup(var.node_pools[count.index], "min_count", 1),
149149
)
150-
max_pods_per_node = lookup(var.node_pools[count.index], "max_pods_per_node", 110)
151-
152150
autoscaling {
153151
min_node_count = lookup(var.node_pools[count.index], "min_count", 1)
154152
max_node_count = lookup(var.node_pools[count.index], "max_count", 100)

0 commit comments

Comments
 (0)