feat: Add Terraform 0.13 constraint and module attribution (terraform-google-modules#792)

BREAKING CHANGE: Minimum Terraform core version increased to 0.13.

Author: bharathkkb

Makefile

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

autogen/main/cluster.tf.tmpl

@@ -567,10 +567,10 @@ resource "google_container_node_pool" "pools" {
  }
 
  dynamic "linux_node_config" {
- for_each = merge(
+ for_each = length(merge(
  local.node_pools_linux_node_configs_sysctls["all"],
  local.node_pools_linux_node_configs_sysctls[each.value["name"]]
- ) != {} ? [1] : []
+ )) != 0 ? [1] : []
 
  content {
  sysctls = merge(

autogen/main/versions.tf.tmpl

@@ -14,16 +14,39 @@
  * limitations under the License.
  */
 
+{% set module_path_str = module_path|string %}
+{% set module_registry_name = module_path_str.split('/')[-1] %}
+
 terraform {
- required_version = ">=0.12.6"
+ required_version = ">=0.13"
 
- required_providers {
 {% if beta_cluster %}
- google-beta = ">= 3.49.0, <4.0.0"
- kubernetes = "~> 1.10, != 1.11.0"
+ required_providers {
+ google-beta = {
+ source = "hashicorp/google-beta"
+ version = ">= 3.49.0, <4.0.0"
+ }
+ kubernetes = {
+ source = "hashicorp/kubernetes"
+ version = "~> 1.10, != 1.11.0"
+ }
+ }
+ provider_meta "google-beta" {
+ module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v13.0.0"
+ }
 {% else %}
- google = ">= 3.39.0, <4.0.0"
- kubernetes = "~> 1.10, != 1.11.0"
-{% endif %}
+ required_providers {
+ google = {
+ source = "hashicorp/google"
+ version = ">= 3.39.0, <4.0.0"
+ }
+ kubernetes = {
+ source = "hashicorp/kubernetes"
+ version = "~> 1.10, != 1.11.0"
+ }
  }
+ provider_meta "google" {
+ module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v13.0.0"
+ }
+{% endif %}
 }

autogen/safer-cluster/versions.tf.tmpl

@@ -16,6 +16,13 @@
 
 {{ autogeneration_note }}
 
+{% set module_path_str = module_path|string %}
+{% set module_registry_name = module_path_str.split('/')[-1] %}
+
 terraform {
- required_version = ">=0.12"
+ required_version = ">=0.13"
+
+ provider_meta "google-beta" {
+ module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v13.0.0"
+ }
 }

build/int.cloudbuild.yaml

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

build/lint.cloudbuild.yaml

@@ -22,7 +22,7 @@ tags:
 - 'lint'
 substitutions:
  _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.2'
+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
 options:
  machineType: 'N1_HIGHCPU_8'
  env:

examples/safer_cluster/main.tf

@@ -27,6 +27,7 @@ locals {
  master_auth_subnetwork = "safer-cluster-master-subnet"
  pods_range_name = "ip-range-pods-${random_string.suffix.result}"
  svc_range_name = "ip-range-svc-${random_string.suffix.result}"
+ subnet_names = [for subnet_self_link in module.gcp-network.subnets_self_links : split("/", subnet_self_link)[length(split("/", subnet_self_link)) - 1]]
 }
 
 provider "google" {
@@ -53,7 +54,7 @@ module "gke" {
  regional = true
  region = var.region
  network = module.gcp-network.network_name
- subnetwork = module.gcp-network.subnets_names[index(module.gcp-network.subnets_names, local.subnet_name)]
+ subnetwork = local.subnet_names[index(module.gcp-network.subnets_names, local.subnet_name)]
  ip_range_pods = local.pods_range_name
  ip_range_services = local.svc_range_name
  compute_engine_service_account = var.compute_engine_service_account

examples/safer_cluster_iap_bastion/apis.tf

@@ -16,7 +16,7 @@
 
 module "enabled_google_apis" {
  source = "terraform-google-modules/project-factory/google//modules/project_services"
- version = "~> 8.0"
+ version = "~> 10.0"
 
  project_id = var.project_id
  disable_services_on_destroy = false

examples/safer_cluster_iap_bastion/provider.tf

@@ -15,7 +15,7 @@
  */
 
 provider "google" {
- version = "~> 3.42.0"
+ version = "~> 3.50.0"
 }
 
 provider "google-beta" {

modules/asm/versions.tf

@@ -0,0 +1,24 @@
+
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+ required_version = ">= 0.13.0"
+
+ provider_meta "google" {
+ module_name = "blueprints/terraform/terraform-google-kubernetes-engine:asm/v13.0.0"
+ }
+}