Skip to content

Commit c227c65

Browse files
morgantemorgante
authored
Merge pull request #282 from kevang/make_nodepool_metadata_optional
Make default metadata, labels and tags optional in beta private cluster
2 parents 9983d8d + 970671f commit c227c65

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
@@ -341,22 +341,14 @@ resource "google_container_node_pool" "pools" {
341341
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
342342
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
343343
labels = merge(
344-
{
345-
"cluster_name" = var.name
346-
},
347-
{
348-
"node_pool" = var.node_pools[count.index]["name"]
349-
},
344+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
345+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
350346
var.node_pools_labels["all"],
351347
var.node_pools_labels[var.node_pools[count.index]["name"]],
352348
)
353349
metadata = merge(
354-
{
355-
"cluster_name" = var.name
356-
},
357-
{
358-
"node_pool" = var.node_pools[count.index]["name"]
359-
},
350+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
351+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
360352
var.node_pools_metadata["all"],
361353
var.node_pools_metadata[var.node_pools[count.index]["name"]],
362354
{
@@ -377,8 +369,8 @@ resource "google_container_node_pool" "pools" {
377369
}
378370
{% endif %}
379371
tags = concat(
380-
["gke-${var.name}"],
381-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
372+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
373+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
382374
var.node_pools_tags["all"],
383375
var.node_pools_tags[var.node_pools[count.index]["name"]],
384376
)

‎cluster.tf‎

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

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -315,22 +315,14 @@ resource "google_container_node_pool" "pools" {
315315
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
316316
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
317317
labels = merge(
318-
{
319-
"cluster_name" = var.name
320-
},
321-
{
322-
"node_pool" = var.node_pools[count.index]["name"]
323-
},
318+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
319+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
324320
var.node_pools_labels["all"],
325321
var.node_pools_labels[var.node_pools[count.index]["name"]],
326322
)
327323
metadata = merge(
328-
{
329-
"cluster_name" = var.name
330-
},
331-
{
332-
"node_pool" = var.node_pools[count.index]["name"]
333-
},
324+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
325+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
334326
var.node_pools_metadata["all"],
335327
var.node_pools_metadata[var.node_pools[count.index]["name"]],
336328
{
@@ -349,8 +341,8 @@ resource "google_container_node_pool" "pools" {
349341
}
350342
}
351343
tags = concat(
352-
["gke-${var.name}"],
353-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
344+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
345+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
354346
var.node_pools_tags["all"],
355347
var.node_pools_tags[var.node_pools[count.index]["name"]],
356348
)

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -243,22 +243,14 @@ resource "google_container_node_pool" "pools" {
243243
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
244244
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
245245
labels = merge(
246-
{
247-
"cluster_name" = var.name
248-
},
249-
{
250-
"node_pool" = var.node_pools[count.index]["name"]
251-
},
246+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
247+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
252248
var.node_pools_labels["all"],
253249
var.node_pools_labels[var.node_pools[count.index]["name"]],
254250
)
255251
metadata = merge(
256-
{
257-
"cluster_name" = var.name
258-
},
259-
{
260-
"node_pool" = var.node_pools[count.index]["name"]
261-
},
252+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
253+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
262254
var.node_pools_metadata["all"],
263255
var.node_pools_metadata[var.node_pools[count.index]["name"]],
264256
{
@@ -277,8 +269,8 @@ resource "google_container_node_pool" "pools" {
277269
}
278270
}
279271
tags = concat(
280-
["gke-${var.name}"],
281-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
272+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
273+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
282274
var.node_pools_tags["all"],
283275
var.node_pools_tags[var.node_pools[count.index]["name"]],
284276
)

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -238,22 +238,14 @@ resource "google_container_node_pool" "pools" {
238238
image_type = lookup(var.node_pools[count.index], "image_type", "COS")
239239
machine_type = lookup(var.node_pools[count.index], "machine_type", "n1-standard-2")
240240
labels = merge(
241-
{
242-
"cluster_name" = var.name
243-
},
244-
{
245-
"node_pool" = var.node_pools[count.index]["name"]
246-
},
241+
lookup(lookup(var.node_pools_labels, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
242+
lookup(lookup(var.node_pools_labels, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
247243
var.node_pools_labels["all"],
248244
var.node_pools_labels[var.node_pools[count.index]["name"]],
249245
)
250246
metadata = merge(
251-
{
252-
"cluster_name" = var.name
253-
},
254-
{
255-
"node_pool" = var.node_pools[count.index]["name"]
256-
},
247+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "cluster_name", true) ? { "cluster_name" = var.name } : {},
248+
lookup(lookup(var.node_pools_metadata, "default_values", {}), "node_pool", true) ? { "node_pool" = var.node_pools[count.index]["name"] } : {},
257249
var.node_pools_metadata["all"],
258250
var.node_pools_metadata[var.node_pools[count.index]["name"]],
259251
{
@@ -272,8 +264,8 @@ resource "google_container_node_pool" "pools" {
272264
}
273265
}
274266
tags = concat(
275-
["gke-${var.name}"],
276-
["gke-${var.name}-${var.node_pools[count.index]["name"]}"],
267+
lookup(var.node_pools_tags, "default_values", [true, true])[0] ? ["gke-${var.name}"] : [],
268+
lookup(var.node_pools_tags, "default_values", [true, true])[1] ? ["gke-${var.name}-${var.node_pools[count.index]["name"]}"] : [],
277269
var.node_pools_tags["all"],
278270
var.node_pools_tags[var.node_pools[count.index]["name"]],
279271
)

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

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

‎modules/private-cluster/cluster.tf‎

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

0 commit comments

Comments
 (0)