feat(TPG>=4.81.0)!: add fqdn policies (#1729)

Author: TheKangaroo

autogen/main/cluster.tf.tmpl

@@ -208,6 +208,9 @@ resource "google_container_cluster" "primary" {
  enable_l4_ilb_subsetting = var.enable_l4_ilb_subsetting
  {% endif %}
  {% endif %}
+{% if beta_cluster %}
+ enable_fqdn_network_policy = var.enable_fqdn_network_policy
+{% endif %}
 {% if autopilot_cluster %}
  enable_autopilot = true
 {% endif %}

autogen/main/variables.tf.tmpl

@@ -560,6 +560,12 @@ variable "workload_config_audit_mode" {
  type = string
  default = "DISABLED"
 }
+
+variable "enable_fqdn_network_policy" {
+ type = bool
+ description = "Enable FQDN Network Policies on the cluster"
+ default = null
+}
 {% endif %}
 
 variable "disable_default_snat" {

autogen/main/versions.tf.tmpl

@@ -24,11 +24,11 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = ">= 4.80.0, < 5.0, !=4.65.0, !=4.65.1"
+ version = ">= 4.81.0, < 5.0, !=4.65.0, !=4.65.1"
  }
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.80.0, < 5.0, !=4.65.0, !=4.65.1"
+ version = ">= 4.81.0, < 5.0, !=4.65.0, !=4.65.1"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

modules/beta-autopilot-private-cluster/README.md

@@ -87,6 +87,7 @@ Then perform the following commands on the root folder:
 | dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
 | enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
 | enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
+| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
 | enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
 | enable\_private\_endpoint | (Beta) Whether the master's internal IP address is used as the cluster endpoint | `bool` | `false` | no |
 | enable\_private\_nodes | (Beta) Whether nodes have internal IP addresses only | `bool` | `false` | no |

modules/beta-autopilot-private-cluster/cluster.tf

@@ -81,7 +81,8 @@ resource "google_container_cluster" "primary" {
  vertical_pod_autoscaling {
  enabled = var.enable_vertical_pod_autoscaling
  }
- enable_autopilot = true
+ enable_fqdn_network_policy = var.enable_fqdn_network_policy
+ enable_autopilot = true
  dynamic "master_authorized_networks_config" {
  for_each = local.master_authorized_networks_config
  content {

modules/beta-autopilot-private-cluster/variables.tf

@@ -386,6 +386,12 @@ variable "workload_config_audit_mode" {
  default = "DISABLED"
 }
 
+variable "enable_fqdn_network_policy" {
+ type = bool
+ description = "Enable FQDN Network Policies on the cluster"
+ default = null
+}
+
 variable "disable_default_snat" {
  type = bool
  description = "Whether to disable the default SNAT to support the private use of public IP addresses"

modules/beta-autopilot-private-cluster/versions.tf

@@ -21,11 +21,11 @@ terraform {
  required_providers {
  google = {
  source = "hashicorp/google"
- version = ">= 4.80.0, < 5.0, !=4.65.0, !=4.65.1"
+ version = ">= 4.81.0, < 5.0, !=4.65.0, !=4.65.1"
  }
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.80.0, < 5.0, !=4.65.0, !=4.65.1"
+ version = ">= 4.81.0, < 5.0, !=4.65.0, !=4.65.1"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

modules/beta-autopilot-public-cluster/README.md

@@ -80,6 +80,7 @@ Then perform the following commands on the root folder:
 | dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `true` | no |
 | enable\_confidential\_nodes | An optional flag to enable confidential node config. | `bool` | `false` | no |
 | enable\_cost\_allocation | Enables Cost Allocation Feature and the cluster name and namespace of your GKE workloads appear in the labels field of the billing export to BigQuery | `bool` | `false` | no |
+| enable\_fqdn\_network\_policy | Enable FQDN Network Policies on the cluster | `bool` | `null` | no |
 | enable\_network\_egress\_export | Whether to enable network egress metering for this cluster. If enabled, a daemonset will be created in the cluster to meter network egress traffic. | `bool` | `false` | no |
 | enable\_resource\_consumption\_export | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. | `bool` | `true` | no |
 | enable\_tpu | Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive! | `bool` | `false` | no |

modules/beta-autopilot-public-cluster/cluster.tf

@@ -81,7 +81,8 @@ resource "google_container_cluster" "primary" {
  vertical_pod_autoscaling {
  enabled = var.enable_vertical_pod_autoscaling
  }
- enable_autopilot = true
+ enable_fqdn_network_policy = var.enable_fqdn_network_policy
+ enable_autopilot = true
  dynamic "master_authorized_networks_config" {
  for_each = local.master_authorized_networks_config
  content {

modules/beta-autopilot-public-cluster/variables.tf

@@ -356,6 +356,12 @@ variable "workload_config_audit_mode" {
  default = "DISABLED"
 }
 
+variable "enable_fqdn_network_policy" {
+ type = bool
+ description = "Enable FQDN Network Policies on the cluster"
+ default = null
+}
+
 variable "disable_default_snat" {
  type = bool
  description = "Whether to disable the default SNAT to support the private use of public IP addresses"