feat: Add support for enabling master_global_access, which is turned …

…on by default. (terraform-google-modules#601)

autogen/main/cluster.tf.tmpl

@@ -260,6 +260,14 @@ resource "google_container_cluster" "primary" {
       enable_private_endpoint = private_cluster_config.value.enable_private_endpoint
       enable_private_nodes    = private_cluster_config.value.enable_private_nodes
       master_ipv4_cidr_block  = private_cluster_config.value.master_ipv4_cidr_block
+      {% if beta_cluster %}
+      dynamic "master_global_access_config" {
+        for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []
+        content {
+          enabled = master_global_access_config.value
+        }
+      }
+      {% endif %}
     }
   }
 {% endif %}

autogen/main/variables.tf.tmpl

@@ -397,9 +397,19 @@ variable "master_ipv4_cidr_block" {
   description = "(Beta) The IP range in CIDR notation to use for the hosted master network"
   default     = "10.0.0.0/28"
 }
+{% if beta_cluster %}
+
+variable "master_global_access_enabled" {
+  type        = bool
+  description = "(Beta) Whether the cluster master is accessible globally (from any region) or only within the same region as the private endpoint."
+
+  default     = true
+}
+{% endif %}
 {% endif %}
 {% if beta_cluster %}
 
+
 variable "istio" {
   description = "(Beta) Enable Istio addon"
   default     = false

autogen/safer-cluster/main.tf.tmpl

@@ -118,6 +118,8 @@ module "gke" {
   // additional configurations.
   enable_private_nodes = true
 
+  master_global_access_enabled = true
+
   master_ipv4_cidr_block = var.master_ipv4_cidr_block
 
   // Istio is recommended for pod-to-pod communications.

modules/beta-private-cluster-update-variant/README.md

@@ -195,6 +195,7 @@ Then perform the following commands on the root folder:
 | maintenance\_recurrence | Frequency of the recurring maintenance window in RFC5545 format. | string | `""` | no |
 | maintenance\_start\_time | Time window specified for daily or recurring 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\_global\_access\_enabled | (Beta) Whether the cluster master is accessible globally (from any region) or only within the same region as the private endpoint. | bool | `"true"` | 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 |
 | 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 (required) | string | n/a | yes |

modules/beta-private-cluster-update-variant/cluster.tf

@@ -233,6 +233,12 @@ resource "google_container_cluster" "primary" {
       enable_private_endpoint = private_cluster_config.value.enable_private_endpoint
       enable_private_nodes    = private_cluster_config.value.enable_private_nodes
       master_ipv4_cidr_block  = private_cluster_config.value.master_ipv4_cidr_block
+      dynamic "master_global_access_config" {
+        for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []
+        content {
+          enabled = master_global_access_config.value
+        }
+      }
     }
   }
 

modules/beta-private-cluster-update-variant/variables.tf

@@ -393,6 +393,14 @@ variable "master_ipv4_cidr_block" {
   default     = "10.0.0.0/28"
 }
 
+variable "master_global_access_enabled" {
+  type        = bool
+  description = "(Beta) Whether the cluster master is accessible globally (from any region) or only within the same region as the private endpoint."
+
+  default = true
+}
+
+
 variable "istio" {
   description = "(Beta) Enable Istio addon"
   default     = false

modules/beta-private-cluster/README.md

@@ -173,6 +173,7 @@ Then perform the following commands on the root folder:
 | maintenance\_recurrence | Frequency of the recurring maintenance window in RFC5545 format. | string | `""` | no |
 | maintenance\_start\_time | Time window specified for daily or recurring 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\_global\_access\_enabled | (Beta) Whether the cluster master is accessible globally (from any region) or only within the same region as the private endpoint. | bool | `"true"` | 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 |
 | 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 (required) | string | n/a | yes |

modules/beta-private-cluster/cluster.tf

@@ -233,6 +233,12 @@ resource "google_container_cluster" "primary" {
       enable_private_endpoint = private_cluster_config.value.enable_private_endpoint
       enable_private_nodes    = private_cluster_config.value.enable_private_nodes
       master_ipv4_cidr_block  = private_cluster_config.value.master_ipv4_cidr_block
+      dynamic "master_global_access_config" {
+        for_each = var.master_global_access_enabled ? [var.master_global_access_enabled] : []
+        content {
+          enabled = master_global_access_config.value
+        }
+      }
     }
   }
 

modules/beta-private-cluster/variables.tf

@@ -393,6 +393,14 @@ variable "master_ipv4_cidr_block" {
   default     = "10.0.0.0/28"
 }
 
+variable "master_global_access_enabled" {
+  type        = bool
+  description = "(Beta) Whether the cluster master is accessible globally (from any region) or only within the same region as the private endpoint."
+
+  default = true
+}
+
+
 variable "istio" {
   description = "(Beta) Enable Istio addon"
   default     = false

modules/beta-public-cluster-update-variant/variables.tf

@@ -369,6 +369,7 @@ variable "default_max_pods_per_node" {
   default     = 110
 }
 
+
 variable "istio" {
   description = "(Beta) Enable Istio addon"
   default     = false

modules/beta-public-cluster/variables.tf

@@ -369,6 +369,7 @@ variable "default_max_pods_per_node" {
   default     = 110
 }
 
+
 variable "istio" {
   description = "(Beta) Enable Istio addon"
   default     = false

modules/safer-cluster-update-variant/main.tf

@@ -114,6 +114,8 @@ module "gke" {
   // additional configurations.
   enable_private_nodes = true
 
+  master_global_access_enabled = true
+
   master_ipv4_cidr_block = var.master_ipv4_cidr_block
 
   // Istio is recommended for pod-to-pod communications.

modules/safer-cluster/main.tf

@@ -114,6 +114,8 @@ module "gke" {
   // additional configurations.
   enable_private_nodes = true
 
+  master_global_access_enabled = true
+
   master_ipv4_cidr_block = var.master_ipv4_cidr_block
 
   // Istio is recommended for pod-to-pod communications.