From 5623d51885b5d3ed44b29264ae86b5d537feb506 Mon Sep 17 00:00:00 2001 From: pmiles01 <55197694+pmiles01@users.noreply.github.com> Date: Wed, 9 Dec 2020 14:08:42 +0000 Subject: [PATCH] feat: Add instance_group_urls output (#618) --- README.md | 1 + autogen/main/outputs.tf.tmpl | 5 +++++ modules/beta-private-cluster-update-variant/README.md | 1 + modules/beta-private-cluster-update-variant/outputs.tf | 5 +++++ modules/beta-private-cluster/README.md | 1 + modules/beta-private-cluster/outputs.tf | 5 +++++ modules/beta-public-cluster-update-variant/README.md | 1 + modules/beta-public-cluster-update-variant/outputs.tf | 5 +++++ modules/beta-public-cluster/README.md | 1 + modules/beta-public-cluster/outputs.tf | 5 +++++ modules/private-cluster-update-variant/README.md | 1 + modules/private-cluster-update-variant/outputs.tf | 5 +++++ modules/private-cluster/README.md | 1 + modules/private-cluster/outputs.tf | 5 +++++ outputs.tf | 5 +++++ 15 files changed, 47 insertions(+) diff --git a/README.md b/README.md index a007d7838..7f2eb5e5f 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,7 @@ Then perform the following commands on the root folder: | horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled | | http\_load\_balancing\_enabled | Whether http load balancing enabled | | identity\_namespace | Workload Identity namespace | +| instance\_group\_urls | List of GKE generated instance groups | | location | Cluster location (region if regional cluster, zone if zonal cluster) | | logging\_service | Logging service used | | master\_authorized\_networks\_config | Networks from which access to master is permitted | diff --git a/autogen/main/outputs.tf.tmpl b/autogen/main/outputs.tf.tmpl index 0c9d4be53..83ee4a3bb 100644 --- a/autogen/main/outputs.tf.tmpl +++ b/autogen/main/outputs.tf.tmpl @@ -131,6 +131,11 @@ output "identity_namespace" { google_container_cluster.primary ] } + +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +} {% if private_cluster %} output "master_ipv4_cidr_block" { diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md index 01028eb3e..b18367f9c 100644 --- a/modules/beta-private-cluster-update-variant/README.md +++ b/modules/beta-private-cluster-update-variant/README.md @@ -241,6 +241,7 @@ Then perform the following commands on the root folder: | horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled | | http\_load\_balancing\_enabled | Whether http load balancing enabled | | identity\_namespace | Workload Identity namespace | +| instance\_group\_urls | List of GKE generated instance groups | | intranode\_visibility\_enabled | Whether intra-node visibility is enabled | | istio\_enabled | Whether Istio is enabled | | location | Cluster location (region if regional cluster, zone if zonal cluster) | diff --git a/modules/beta-private-cluster-update-variant/outputs.tf b/modules/beta-private-cluster-update-variant/outputs.tf index 12084a72c..c294fc9ef 100644 --- a/modules/beta-private-cluster-update-variant/outputs.tf +++ b/modules/beta-private-cluster-update-variant/outputs.tf @@ -132,6 +132,11 @@ output "identity_namespace" { ] } +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +} + output "master_ipv4_cidr_block" { description = "The IP range in CIDR notation used for the hosted master network" value = var.master_ipv4_cidr_block diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md index e33ec012c..9f3ee076e 100644 --- a/modules/beta-private-cluster/README.md +++ b/modules/beta-private-cluster/README.md @@ -219,6 +219,7 @@ Then perform the following commands on the root folder: | horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled | | http\_load\_balancing\_enabled | Whether http load balancing enabled | | identity\_namespace | Workload Identity namespace | +| instance\_group\_urls | List of GKE generated instance groups | | intranode\_visibility\_enabled | Whether intra-node visibility is enabled | | istio\_enabled | Whether Istio is enabled | | location | Cluster location (region if regional cluster, zone if zonal cluster) | diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf index 12084a72c..c294fc9ef 100644 --- a/modules/beta-private-cluster/outputs.tf +++ b/modules/beta-private-cluster/outputs.tf @@ -132,6 +132,11 @@ output "identity_namespace" { ] } +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +} + output "master_ipv4_cidr_block" { description = "The IP range in CIDR notation used for the hosted master network" value = var.master_ipv4_cidr_block diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md index 35a296988..2e9d119b4 100644 --- a/modules/beta-public-cluster-update-variant/README.md +++ b/modules/beta-public-cluster-update-variant/README.md @@ -230,6 +230,7 @@ Then perform the following commands on the root folder: | horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled | | http\_load\_balancing\_enabled | Whether http load balancing enabled | | identity\_namespace | Workload Identity namespace | +| instance\_group\_urls | List of GKE generated instance groups | | intranode\_visibility\_enabled | Whether intra-node visibility is enabled | | istio\_enabled | Whether Istio is enabled | | location | Cluster location (region if regional cluster, zone if zonal cluster) | diff --git a/modules/beta-public-cluster-update-variant/outputs.tf b/modules/beta-public-cluster-update-variant/outputs.tf index 9a8ec345e..bd3cc8be1 100644 --- a/modules/beta-public-cluster-update-variant/outputs.tf +++ b/modules/beta-public-cluster-update-variant/outputs.tf @@ -132,6 +132,11 @@ output "identity_namespace" { ] } +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +} + output "istio_enabled" { description = "Whether Istio is enabled" value = local.cluster_istio_enabled diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md index 70da69984..929d320da 100644 --- a/modules/beta-public-cluster/README.md +++ b/modules/beta-public-cluster/README.md @@ -208,6 +208,7 @@ Then perform the following commands on the root folder: | horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled | | http\_load\_balancing\_enabled | Whether http load balancing enabled | | identity\_namespace | Workload Identity namespace | +| instance\_group\_urls | List of GKE generated instance groups | | intranode\_visibility\_enabled | Whether intra-node visibility is enabled | | istio\_enabled | Whether Istio is enabled | | location | Cluster location (region if regional cluster, zone if zonal cluster) | diff --git a/modules/beta-public-cluster/outputs.tf b/modules/beta-public-cluster/outputs.tf index 9a8ec345e..bd3cc8be1 100644 --- a/modules/beta-public-cluster/outputs.tf +++ b/modules/beta-public-cluster/outputs.tf @@ -132,6 +132,11 @@ output "identity_namespace" { ] } +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +} + output "istio_enabled" { description = "Whether Istio is enabled" value = local.cluster_istio_enabled diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md index d020228d0..11b1a5416 100644 --- a/modules/private-cluster-update-variant/README.md +++ b/modules/private-cluster-update-variant/README.md @@ -217,6 +217,7 @@ Then perform the following commands on the root folder: | horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled | | http\_load\_balancing\_enabled | Whether http load balancing enabled | | identity\_namespace | Workload Identity namespace | +| instance\_group\_urls | List of GKE generated instance groups | | location | Cluster location (region if regional cluster, zone if zonal cluster) | | logging\_service | Logging service used | | master\_authorized\_networks\_config | Networks from which access to master is permitted | diff --git a/modules/private-cluster-update-variant/outputs.tf b/modules/private-cluster-update-variant/outputs.tf index 434ef2f36..8b80afa0b 100644 --- a/modules/private-cluster-update-variant/outputs.tf +++ b/modules/private-cluster-update-variant/outputs.tf @@ -132,6 +132,11 @@ output "identity_namespace" { ] } +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +} + output "master_ipv4_cidr_block" { description = "The IP range in CIDR notation used for the hosted master network" value = var.master_ipv4_cidr_block diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md index b2256327c..3df2b1664 100644 --- a/modules/private-cluster/README.md +++ b/modules/private-cluster/README.md @@ -195,6 +195,7 @@ Then perform the following commands on the root folder: | horizontal\_pod\_autoscaling\_enabled | Whether horizontal pod autoscaling enabled | | http\_load\_balancing\_enabled | Whether http load balancing enabled | | identity\_namespace | Workload Identity namespace | +| instance\_group\_urls | List of GKE generated instance groups | | location | Cluster location (region if regional cluster, zone if zonal cluster) | | logging\_service | Logging service used | | master\_authorized\_networks\_config | Networks from which access to master is permitted | diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf index 434ef2f36..8b80afa0b 100644 --- a/modules/private-cluster/outputs.tf +++ b/modules/private-cluster/outputs.tf @@ -132,6 +132,11 @@ output "identity_namespace" { ] } +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +} + output "master_ipv4_cidr_block" { description = "The IP range in CIDR notation used for the hosted master network" value = var.master_ipv4_cidr_block diff --git a/outputs.tf b/outputs.tf index 9677c7c4c..d0342cefa 100644 --- a/outputs.tf +++ b/outputs.tf @@ -131,3 +131,8 @@ output "identity_namespace" { google_container_cluster.primary ] } + +output "instance_group_urls" { + description = "List of GKE generated instance groups" + value = google_container_cluster.primary.instance_group_urls +}