support reservation affinity

terraform-google-modules · Aug 3, 2024 · 7c5f1d8 · 7c5f1d8
1 parent a4f2a1c
commit 7c5f1d8
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -890,7 +890,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(

diff --git a/cluster.tf b/cluster.tf
@@ -600,7 +600,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(
@@ -883,7 +883,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -768,7 +768,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(
@@ -1065,7 +1065,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -685,7 +685,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(
@@ -981,7 +981,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -747,7 +747,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(
@@ -1044,7 +1044,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -664,7 +664,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(
@@ -960,7 +960,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -704,7 +704,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(
@@ -988,7 +988,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -621,7 +621,7 @@ resource "google_container_node_pool" "pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(
@@ -904,7 +904,7 @@ resource "google_container_node_pool" "windows_pools" {
       content {
         consume_reservation_type = reservation_affinity.value.consume_reservation_type
         key                      = reservation_affinity.value.key
-        values                   = split(",", reservation_affinity.value.values)
+        values                   = reservation_affinity.value.values == null ? null : split(",", reservation_affinity.value.values)
       }
     }
     labels = merge(