Skip to content

Commit 9e602cb

Browse files
chrissngchrissng
authored
Merge pull request #2 from terraform-google-modules/master
Merge from master
2 parents b63658e + c227c65 commit 9e602cb

File tree

7 files changed

+42
-98
lines changed

7 files changed

+42
-98
lines changed

‎autogen/cluster.tf

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -351,22 +351,14 @@ resource "google_container_node_pool" "pools" {
351351
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
352352
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
353353
labels = merge(
354-
{
355-
"cluster_name" = var.name
356-
},
357-
{
358-
"node_pool" = var.node_pools[count.index]["name"]
359-
},
354+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
355+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
360356
var.node_pools_labels["all"],
361357
var.node_pools_labels[var.node_pools[count.index]["name"]],
362358
)
363359
metadata = merge(
364-
{
365-
"cluster_name" = var.name
366-
},
367-
{
368-
"node_pool" = var.node_pools[count.index]["name"]
369-
},
360+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
361+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
370362
var.node_pools_metadata["all"],
371363
var.node_pools_metadata[var.node_pools[count.index]["name"]],
372364
{
@@ -387,8 +379,8 @@ resource "google_container_node_pool" "pools" {
387379
}
388380
{% endif %}
389381
tags = concat(
390-
["gke-${var.name}"],
391-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
382+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
383+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
392384
var.node_pools_tags["all"],
393385
var.node_pools_tags[var.node_pools[count.index]["name"]],
394386
)

‎cluster.tf

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -162,31 +162,23 @@ resource "google_container_node_pool" "pools" {
162162
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
163163
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
164164
labels = merge(
165-
{
166-
"cluster_name" = var.name
167-
},
168-
{
169-
"node_pool" = var.node_pools[count.index]["name"]
170-
},
165+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
166+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
171167
var.node_pools_labels["all"],
172168
var.node_pools_labels[var.node_pools[count.index]["name"]],
173169
)
174170
metadata = merge(
175-
{
176-
"cluster_name" = var.name
177-
},
178-
{
179-
"node_pool" = var.node_pools[count.index]["name"]
180-
},
171+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
172+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
181173
var.node_pools_metadata["all"],
182174
var.node_pools_metadata[var.node_pools[count.index]["name"]],
183175
{
184176
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
185177
},
186178
)
187179
tags = concat(
188-
["gke-${var.name}"],
189-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
180+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
181+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
190182
var.node_pools_tags["all"],
191183
var.node_pools_tags[var.node_pools[count.index]["name"]],
192184
)

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -323,22 +323,14 @@ resource "google_container_node_pool" "pools" {
323323
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
324324
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
325325
labels = merge(
326-
{
327-
"cluster_name" = var.name
328-
},
329-
{
330-
"node_pool" = var.node_pools[count.index]["name"]
331-
},
326+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
327+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
332328
var.node_pools_labels["all"],
333329
var.node_pools_labels[var.node_pools[count.index]["name"]],
334330
)
335331
metadata = merge(
336-
{
337-
"cluster_name" = var.name
338-
},
339-
{
340-
"node_pool" = var.node_pools[count.index]["name"]
341-
},
332+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
333+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
342334
var.node_pools_metadata["all"],
343335
var.node_pools_metadata[var.node_pools[count.index]["name"]],
344336
{
@@ -357,8 +349,8 @@ resource "google_container_node_pool" "pools" {
357349
}
358350
}
359351
tags = concat(
360-
["gke-${var.name}"],
361-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
352+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
353+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
362354
var.node_pools_tags["all"],
363355
var.node_pools_tags[var.node_pools[count.index]["name"]],
364356
)

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -251,22 +251,14 @@ resource "google_container_node_pool" "pools" {
251251
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
252252
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
253253
labels = merge(
254-
{
255-
"cluster_name" = var.name
256-
},
257-
{
258-
"node_pool" = var.node_pools[count.index]["name"]
259-
},
254+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
255+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
260256
var.node_pools_labels["all"],
261257
var.node_pools_labels[var.node_pools[count.index]["name"]],
262258
)
263259
metadata = merge(
264-
{
265-
"cluster_name" = var.name
266-
},
267-
{
268-
"node_pool" = var.node_pools[count.index]["name"]
269-
},
260+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
261+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
270262
var.node_pools_metadata["all"],
271263
var.node_pools_metadata[var.node_pools[count.index]["name"]],
272264
{
@@ -285,8 +277,8 @@ resource "google_container_node_pool" "pools" {
285277
}
286278
}
287279
tags = concat(
288-
["gke-${var.name}"],
289-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
280+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
281+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
290282
var.node_pools_tags["all"],
291283
var.node_pools_tags[var.node_pools[count.index]["name"]],
292284
)

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,22 +246,14 @@ resource "google_container_node_pool" "pools" {
246246
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
247247
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
248248
labels = merge(
249-
{
250-
"cluster_name" = var.name
251-
},
252-
{
253-
"node_pool" = var.node_pools[count.index]["name"]
254-
},
249+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
250+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
255251
var.node_pools_labels["all"],
256252
var.node_pools_labels[var.node_pools[count.index]["name"]],
257253
)
258254
metadata = merge(
259-
{
260-
"cluster_name" = var.name
261-
},
262-
{
263-
"node_pool" = var.node_pools[count.index]["name"]
264-
},
255+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
256+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
265257
var.node_pools_metadata["all"],
266258
var.node_pools_metadata[var.node_pools[count.index]["name"]],
267259
{
@@ -280,8 +272,8 @@ resource "google_container_node_pool" "pools" {
280272
}
281273
}
282274
tags = concat(
283-
["gke-${var.name}"],
284-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
275+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
276+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
285277
var.node_pools_tags["all"],
286278
var.node_pools_tags[var.node_pools[count.index]["name"]],
287279
)

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -239,31 +239,23 @@ resource "google_container_node_pool" "pools" {
239239
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
240240
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
241241
labels = merge(
242-
{
243-
"cluster_name" = var.name
244-
},
245-
{
246-
"node_pool" = var.node_pools[count.index]["name"]
247-
},
242+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
243+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
248244
var.node_pools_labels["all"],
249245
var.node_pools_labels[var.node_pools[count.index]["name"]],
250246
)
251247
metadata = merge(
252-
{
253-
"cluster_name" = var.name
254-
},
255-
{
256-
"node_pool" = var.node_pools[count.index]["name"]
257-
},
248+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
249+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
258250
var.node_pools_metadata["all"],
259251
var.node_pools_metadata[var.node_pools[count.index]["name"]],
260252
{
261253
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
262254
},
263255
)
264256
tags = concat(
265-
["gke-${var.name}"],
266-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
257+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
258+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
267259
var.node_pools_tags["all"],
268260
var.node_pools_tags[var.node_pools[count.index]["name"]],
269261
)

‎modules/private-cluster/cluster.tf

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,31 +167,23 @@ resource "google_container_node_pool" "pools" {
167167
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
168168
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
169169
labels = merge(
170-
{
171-
"cluster_name" = var.name
172-
},
173-
{
174-
"node_pool" = var.node_pools[count.index]["name"]
175-
},
170+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
171+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
176172
var.node_pools_labels["all"],
177173
var.node_pools_labels[var.node_pools[count.index]["name"]],
178174
)
179175
metadata = merge(
180-
{
181-
"cluster_name" = var.name
182-
},
183-
{
184-
"node_pool" = var.node_pools[count.index]["name"]
185-
},
176+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
177+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
186178
var.node_pools_metadata["all"],
187179
var.node_pools_metadata[var.node_pools[count.index]["name"]],
188180
{
189181
"disable-legacy-endpoints" = var.disable_legacy_metadata_endpoints
190182
},
191183
)
192184
tags = concat(
193-
["gke-${var.name}"],
194-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
185+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
186+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
195187
var.node_pools_tags["all"],
196188
var.node_pools_tags[var.node_pools[count.index]["name"]],
197189
)

0 commit comments

Comments
 (0)