feat: Add variable disable_default_snat (terraform-google-modules#625)

Author: zioproto

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.0
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

autogen/main/cluster.tf.tmpl

@@ -57,6 +57,11 @@ resource "google_container_cluster" "primary" {
 
  subnetwork = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
 
+{% if beta_cluster %}
+ default_snat_status{
+ disabled = var.disable_default_snat
+ }
+{% endif %}
 {% if beta_cluster %}
  min_master_version = var.release_channel != null ? null : local.master_version
 {% else %}

autogen/main/variables.tf.tmpl

@@ -550,3 +550,11 @@ variable "gcloud_skip_download" {
  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
  default = true
 }
+
+{% if beta_cluster %}
+variable "disable_default_snat" {
+ type = bool
+ description = "Whether to disable the default SNAT to support the private use of public IP addresses"
+ default = false
+}
+{% endif %}

autogen/main/versions.tf.tmpl

@@ -19,7 +19,7 @@ terraform {
 
  required_providers {
 {% if beta_cluster %}
- google-beta = ">= 3.29.0, <4.0.0"
+ google-beta = ">= 3.32.0, <4.0.0"
 {% else %}
  google = ">= 3.16, <4.0.0"
 {% endif %}

autogen/safer-cluster/main.tf.tmpl

@@ -49,6 +49,8 @@ module "gke" {
  ip_range_pods = var.ip_range_pods
  ip_range_services = var.ip_range_services
 
+ disable_default_snat = var.disable_default_snat
+
  add_cluster_firewall_rules = var.add_cluster_firewall_rules
  firewall_priority = var.firewall_priority
  firewall_inbound_ports = var.firewall_inbound_ports

autogen/safer-cluster/variables.tf.tmpl

@@ -363,3 +363,9 @@ variable "config_connector" {
  description = "(Beta) Whether ConfigConnector is enabled for this cluster."
  default = false
 }
+
+variable "disable_default_snat" {
+ type = bool
+ description = "Whether to disable the default SNAT to support the private use of public IP addresses"
+ default = false
+}

build/int.cloudbuild.yaml

@@ -429,6 +429,6 @@ tags:
 - 'integration'
 substitutions:
  _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
 options:
  machineType: 'N1_HIGHCPU_8'

build/lint.cloudbuild.yaml

@@ -22,4 +22,4 @@ tags:
 - 'lint'
 substitutions:
  _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'
+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'

examples/node_pool/main.tf

@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
- version = "~> 3.29.0"
+ version = "~> 3.32.0"
  region = var.region
 }
 

examples/node_pool_update_variant_beta/main.tf

@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
- version = "~> 3.29.0"
+ version = "~> 3.32.0"
  credentials = file(var.credentials_path)
  region = var.region
 }