feat: Add master_ipv4_cidr_block output for private clusters (#427)

kravvcu · web-flow · commit 2cc64c8d1e23 · 2020-02-10T16:57:46.000-05:00
diff --git a/autogen/main/outputs.tf.tmpl b/autogen/main/outputs.tf.tmpl
@@ -118,7 +118,14 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = local.service_account
 }
+{% if private_cluster %}
 
+output "master_ipv4_cidr_block" {
+  description = "The IP range in CIDR notation used for the hosted master network"
+  value       = var.master_ipv4_cidr_block
+}
+
+{% endif %}
 {% if beta_cluster %}
 
 output "istio_enabled" {
diff --git a/autogen/safer-cluster/outputs.tf.tmpl b/autogen/safer-cluster/outputs.tf.tmpl
@@ -116,3 +116,8 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = module.gke.service_account
 }
+
+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/autogen/safer-cluster/variables.tf.tmpl b/autogen/safer-cluster/variables.tf.tmpl
@@ -228,7 +228,7 @@ variable "cluster_resource_labels" {
 
 variable "master_ipv4_cidr_block" {
   type        = string
-  description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
+  description = "The IP range in CIDR notation to use for the hosted master network"
   default     = "10.0.0.0/28"
 }
 
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -239,6 +239,7 @@ Then perform the following commands on the root folder:
 | 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 |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation used for the hosted master network |
 | master\_version | Current master kubernetes version |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
diff --git a/modules/beta-private-cluster-update-variant/outputs.tf b/modules/beta-private-cluster-update-variant/outputs.tf
@@ -119,6 +119,11 @@ output "service_account" {
   value       = local.service_account
 }
 
+output "master_ipv4_cidr_block" {
+  description = "The IP range in CIDR notation used for the hosted master network"
+  value       = var.master_ipv4_cidr_block
+}
+
 
 output "istio_enabled" {
   description = "Whether Istio is enabled"
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -217,6 +217,7 @@ Then perform the following commands on the root folder:
 | 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 |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation used for the hosted master network |
 | master\_version | Current master kubernetes version |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf
@@ -119,6 +119,11 @@ output "service_account" {
   value       = local.service_account
 }
 
+output "master_ipv4_cidr_block" {
+  description = "The IP range in CIDR notation used for the hosted master network"
+  value       = var.master_ipv4_cidr_block
+}
+
 
 output "istio_enabled" {
   description = "Whether Istio is enabled"
diff --git a/modules/beta-public-cluster/outputs.tf b/modules/beta-public-cluster/outputs.tf
@@ -119,7 +119,6 @@ output "service_account" {
   value       = local.service_account
 }
 
-
 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
@@ -213,6 +213,7 @@ Then perform the following commands on the root folder:
 | 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 |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation used for the hosted master network |
 | master\_version | Current master kubernetes version |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
diff --git a/modules/private-cluster-update-variant/outputs.tf b/modules/private-cluster-update-variant/outputs.tf
@@ -119,3 +119,8 @@ output "service_account" {
   value       = local.service_account
 }
 
+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
@@ -191,6 +191,7 @@ Then perform the following commands on the root folder:
 | 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 |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation used for the hosted master network |
 | master\_version | Current master kubernetes version |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
@@ -119,3 +119,8 @@ output "service_account" {
   value       = local.service_account
 }
 
+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/safer-cluster-update-variant/README.md b/modules/safer-cluster-update-variant/README.md
@@ -222,7 +222,7 @@ For simplicity, we suggest using `roles/container.admin` and
 | logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | string | `"logging.googleapis.com/kubernetes"` | no |
 | maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | string | `"05:00"` | no |
 | master\_authorized\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | object | `<list>` | no |
-| master\_ipv4\_cidr\_block | (Beta) The IP range in CIDR notation to use for the hosted master network | string | `"10.0.0.0/28"` | no |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation to use for the hosted master network | string | `"10.0.0.0/28"` | no |
 | monitoring\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | string | `"monitoring.googleapis.com/kubernetes"` | no |
 | name | The name of the cluster | string | n/a | yes |
 | network | The VPC network to host the cluster in | string | n/a | yes |
@@ -259,6 +259,7 @@ For simplicity, we suggest using `roles/container.admin` and
 | 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 |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation used for the hosted master network |
 | master\_version | Current master kubernetes version |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
diff --git a/modules/safer-cluster-update-variant/outputs.tf b/modules/safer-cluster-update-variant/outputs.tf
@@ -116,3 +116,8 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = module.gke.service_account
 }
+
+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/safer-cluster-update-variant/variables.tf b/modules/safer-cluster-update-variant/variables.tf
@@ -228,7 +228,7 @@ variable "cluster_resource_labels" {
 
 variable "master_ipv4_cidr_block" {
   type        = string
-  description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
+  description = "The IP range in CIDR notation to use for the hosted master network"
   default     = "10.0.0.0/28"
 }
 
diff --git a/modules/safer-cluster/README.md b/modules/safer-cluster/README.md
@@ -222,7 +222,7 @@ For simplicity, we suggest using `roles/container.admin` and
 | logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | string | `"logging.googleapis.com/kubernetes"` | no |
 | maintenance\_start\_time | Time window specified for daily maintenance operations in RFC3339 format | string | `"05:00"` | no |
 | master\_authorized\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | object | `<list>` | no |
-| master\_ipv4\_cidr\_block | (Beta) The IP range in CIDR notation to use for the hosted master network | string | `"10.0.0.0/28"` | no |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation to use for the hosted master network | string | `"10.0.0.0/28"` | no |
 | monitoring\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | string | `"monitoring.googleapis.com/kubernetes"` | no |
 | name | The name of the cluster | string | n/a | yes |
 | network | The VPC network to host the cluster in | string | n/a | yes |
@@ -259,6 +259,7 @@ For simplicity, we suggest using `roles/container.admin` and
 | 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 |
+| master\_ipv4\_cidr\_block | The IP range in CIDR notation used for the hosted master network |
 | master\_version | Current master kubernetes version |
 | min\_master\_version | Minimum master kubernetes version |
 | monitoring\_service | Monitoring service used |
diff --git a/modules/safer-cluster/outputs.tf b/modules/safer-cluster/outputs.tf
@@ -116,3 +116,8 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = module.gke.service_account
 }
+
+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/safer-cluster/variables.tf b/modules/safer-cluster/variables.tf
@@ -228,7 +228,7 @@ variable "cluster_resource_labels" {
 
 variable "master_ipv4_cidr_block" {
   type        = string
-  description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
+  description = "The IP range in CIDR notation to use for the hosted master network"
   default     = "10.0.0.0/28"
 }
 
diff --git a/outputs.tf b/outputs.tf
@@ -118,4 +118,3 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = local.service_account
 }
-

Original file line number	Diff line number	Diff line change
`@@ -116,3 +116,8 @@ output "service_account" {`
`116`	`116`	description = "The service account to default running nodes as if not overridden in `node_pools`."
`117`	`117`	`value = module.gke.service_account`
`118`	`118`	`}`
	`119`	`+`
	`120`	`+output "master_ipv4_cidr_block" {`
	`121`	`+ description = "The IP range in CIDR notation used for the hosted master network"`
	`122`	`+ value = var.master_ipv4_cidr_block`
	`123`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ variable "cluster_resource_labels" {`
`228`	`228`
`229`	`229`	`variable "master_ipv4_cidr_block" {`
`230`	`230`	`type = string`
`231`		`- description = "(Beta) The IP range in CIDR notation to use for the hosted master network"`
	`231`	`+ description = "The IP range in CIDR notation to use for the hosted master network"`
`232`	`232`	`default = "10.0.0.0/28"`
`233`	`233`	`}`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ output "service_account" {`
`119`	`119`	`value = local.service_account`
`120`	`120`	`}`
`121`	`121`
`122`		`-`
`123`	`122`	`output "istio_enabled" {`
`124`	`123`	`description = "Whether Istio is enabled"`
`125`	`124`	`value = local.cluster_istio_enabled`
Original file line number	Diff line number	Diff line change
`@@ -119,3 +119,8 @@ output "service_account" {`
`119`	`119`	`value = local.service_account`
`120`	`120`	`}`
`121`	`121`
	`122`	`+output "master_ipv4_cidr_block" {`
	`123`	`+ description = "The IP range in CIDR notation used for the hosted master network"`
	`124`	`+ value = var.master_ipv4_cidr_block`
	`125`	`+}`
	`126`	`+`