From 7b049e63d5f0b4ff7b0e2e35249c8344b90de240 Mon Sep 17 00:00:00 2001 From: Laura Seidler Date: Tue, 12 Apr 2022 13:23:21 +0200 Subject: [PATCH] Add keeper for `enable_gcfs` node pool option for update variants As changing the `gcfs_config` block currently forces a replacement of the node pool, see: https://github.com/hashicorp/terraform-provider-google/blob/5290a9f74d491bd3a05c32cdc60773ac6c53d4ae/google/node_config.go#L119 Fixes #1217 --- autogen/main/cluster.tf.tmpl | 1 + modules/beta-private-cluster-update-variant/cluster.tf | 1 + modules/beta-public-cluster-update-variant/cluster.tf | 1 + modules/private-cluster-update-variant/cluster.tf | 1 + 4 files changed, 4 insertions(+) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 6abd539edf..e05fc187ec 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -435,6 +435,7 @@ locals { "spot", {% endif %} "service_account", + "enable_gcfs", ] } diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index ea8c36adea..7a35f0fa9d 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -374,6 +374,7 @@ locals { "preemptible", "spot", "service_account", + "enable_gcfs", ] } diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index a81dbe457f..09e16e8924 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -355,6 +355,7 @@ locals { "preemptible", "spot", "service_account", + "enable_gcfs", ] } diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index 87a45f9c21..4b182e7006 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -247,6 +247,7 @@ locals { "min_cpu_platform", "preemptible", "service_account", + "enable_gcfs", ] }