Use cluster ID for name output

terraform-google-modules · Mar 29, 2022 · 7e26938 · 7e26938
1 parent 43b7728
commit 7e26938
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 19 deletions.
diff --git a/autogen/main/main.tf.tmpl b/autogen/main/main.tf.tmpl
@@ -175,6 +175,13 @@ locals {
   cluster_zones    = sort(local.cluster_output_zones)
 
   cluster_name                               = local.cluster_output_name
+  {% if autopilot_cluster != true %}
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
+  {% else %}
+  // cluster ID is in the form project/location/name
+  cluster_name_computed                      = element(split("/", local.cluster_id), length(split("/", local.cluster_id)) - 1)
+  {% endif %}
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/autogen/main/outputs.tf.tmpl b/autogen/main/outputs.tf.tmpl
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/main.tf b/main.tf
@@ -124,7 +124,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-autopilot-private-cluster/main.tf b/modules/beta-autopilot-private-cluster/main.tf
@@ -107,7 +107,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // cluster ID is in the form project/location/name
+  cluster_name_computed                      = element(split("/", local.cluster_id), length(split("/", local.cluster_id)) - 1)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-autopilot-private-cluster/outputs.tf b/modules/beta-autopilot-private-cluster/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/modules/beta-autopilot-public-cluster/main.tf b/modules/beta-autopilot-public-cluster/main.tf
@@ -106,7 +106,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // cluster ID is in the form project/location/name
+  cluster_name_computed                      = element(split("/", local.cluster_id), length(split("/", local.cluster_id)) - 1)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-autopilot-public-cluster/outputs.tf b/modules/beta-autopilot-public-cluster/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/modules/beta-private-cluster-update-variant/main.tf b/modules/beta-private-cluster-update-variant/main.tf
@@ -147,7 +147,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-private-cluster-update-variant/outputs.tf b/modules/beta-private-cluster-update-variant/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/modules/beta-private-cluster/main.tf b/modules/beta-private-cluster/main.tf
@@ -147,7 +147,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/modules/beta-public-cluster-update-variant/main.tf b/modules/beta-public-cluster-update-variant/main.tf
@@ -146,7 +146,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-public-cluster-update-variant/outputs.tf b/modules/beta-public-cluster-update-variant/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/modules/beta-public-cluster/main.tf b/modules/beta-public-cluster/main.tf
@@ -146,7 +146,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/beta-public-cluster/outputs.tf b/modules/beta-public-cluster/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/modules/private-cluster-update-variant/main.tf b/modules/private-cluster-update-variant/main.tf
@@ -125,7 +125,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/private-cluster-update-variant/outputs.tf b/modules/private-cluster-update-variant/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/modules/private-cluster/main.tf b/modules/private-cluster/main.tf
@@ -125,7 +125,9 @@ locals {
   cluster_region   = var.regional ? var.region : join("-", slice(split("-", local.cluster_location), 0, 2))
   cluster_zones    = sort(local.cluster_output_zones)
 
-  cluster_name                               = local.cluster_output_name
+  cluster_name = local.cluster_output_name
+  // node pool ID is in the form project/location/cluster/name
+  cluster_name_computed                      = element(split("/", google_container_node_pool.pools.id), length(split("/", google_container_node_pool.pools.id)) - 2)
   cluster_network_tag                        = "gke-${var.name}"
   cluster_ca_certificate                     = local.cluster_master_auth_map["cluster_ca_certificate"]
   cluster_master_version                     = local.cluster_output_master_version

diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any

diff --git a/outputs.tf b/outputs.tf
@@ -23,7 +23,7 @@ output "cluster_id" {
 
 output "name" {
   description = "Cluster name"
-  value       = local.cluster_name
+  value       = local.cluster_name_computed
   depends_on = [
     /* Nominally, the cluster name is populated as soon as it is known to Terraform.
     * However, the cluster may not be in a usable state yet.  Therefore any