Skip to content

Commit c7c9f44

Browse files
authored
fix: source node pools' auto_upgrade configuration from the GKE cluster (#1293)
default_auto_upgrade
1 parent 37b5da8 commit c7c9f44

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ resource "google_container_node_pool" "pools" {
530530

531531
cluster = google_container_cluster.primary.name
532532

533-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
533+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
534534
each.value,
535535
"version",
536536
google_container_cluster.primary.min_master_version,

cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ resource "google_container_node_pool" "pools" {
259259

260260
cluster = google_container_cluster.primary.name
261261

262-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
262+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
263263
each.value,
264264
"version",
265265
google_container_cluster.primary.min_master_version,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ resource "google_container_node_pool" "pools" {
465465

466466
cluster = google_container_cluster.primary.name
467467

468-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
468+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
469469
each.value,
470470
"version",
471471
google_container_cluster.primary.min_master_version,

modules/beta-private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ resource "google_container_node_pool" "pools" {
377377

378378
cluster = google_container_cluster.primary.name
379379

380-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
380+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
381381
each.value,
382382
"version",
383383
google_container_cluster.primary.min_master_version,

modules/beta-public-cluster-update-variant/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ resource "google_container_node_pool" "pools" {
446446

447447
cluster = google_container_cluster.primary.name
448448

449-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
449+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
450450
each.value,
451451
"version",
452452
google_container_cluster.primary.min_master_version,

modules/beta-public-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ resource "google_container_node_pool" "pools" {
358358

359359
cluster = google_container_cluster.primary.name
360360

361-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
361+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
362362
each.value,
363363
"version",
364364
google_container_cluster.primary.min_master_version,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ resource "google_container_node_pool" "pools" {
359359

360360
cluster = google_container_cluster.primary.name
361361

362-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
362+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
363363
each.value,
364364
"version",
365365
google_container_cluster.primary.min_master_version,

modules/private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ resource "google_container_node_pool" "pools" {
272272

273273
cluster = google_container_cluster.primary.name
274274

275-
version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
275+
version = lookup(each.value, "auto_upgrade", local.default_auto_upgrade) ? "" : lookup(
276276
each.value,
277277
"version",
278278
google_container_cluster.primary.min_master_version,

0 commit comments

Comments
 (0)