run autogen

terraform-google-modules · Nov 20, 2019 · 1a1d449 · 1a1d449
1 parent 0eb1e16
commit 1a1d449
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 27 deletions.
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -285,19 +285,10 @@ resource "google_container_node_pool" "pools" {
   project  = var.project_id
   location = local.location
   // use node_locations if provided, defaults to cluster level node_locations if not specified
-<<<<<<< HEAD
-<<<<<<< HEAD
   node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : null
-  cluster  = google_container_cluster.primary.name
-=======
-  node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : google_container_cluster.primary.node_locations
-=======
-  node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : null
->>>>>>> Run autogen
 
   cluster = google_container_cluster.primary.name
 
->>>>>>> Fix autogen code formatting issues which were inconsistent with what terraform format does to the generated code
   version = lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(
     var.node_pools[count.index],
     "version",

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -213,19 +213,10 @@ resource "google_container_node_pool" "pools" {
   project  = var.project_id
   location = local.location
   // use node_locations if provided, defaults to cluster level node_locations if not specified
-<<<<<<< HEAD
-<<<<<<< HEAD
   node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : null
-  cluster  = google_container_cluster.primary.name
-=======
-  node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : google_container_cluster.primary.node_locations
-=======
-  node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : null
->>>>>>> Run autogen
 
   cluster = google_container_cluster.primary.name
 
->>>>>>> Fix autogen code formatting issues which were inconsistent with what terraform format does to the generated code
   version = lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(
     var.node_pools[count.index],
     "version",

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -208,19 +208,10 @@ resource "google_container_node_pool" "pools" {
   project  = var.project_id
   location = local.location
   // use node_locations if provided, defaults to cluster level node_locations if not specified
-<<<<<<< HEAD
-<<<<<<< HEAD
   node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : null
-  cluster  = google_container_cluster.primary.name
-=======
-  node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : google_container_cluster.primary.node_locations
-=======
-  node_locations = lookup(var.node_pools[count.index], "node_locations", "") != "" ? split(",", var.node_pools[count.index]["node_locations"]) : null
->>>>>>> Run autogen
 
   cluster = google_container_cluster.primary.name
 
->>>>>>> Fix autogen code formatting issues which were inconsistent with what terraform format does to the generated code
   version = lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(
     var.node_pools[count.index],
     "version",