From c3981445e1cf886a80f785560aef2f79d6dc4126 Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Fri, 12 Mar 2021 13:32:40 -0600 Subject: [PATCH] fix: Revert attribution fix (#845) * revert: Fix attribution for safer cluster modules (#830) * update to 14.0 * temporarily test with 0.14x tf image in ci * bump setup pf versions * bump setup provider * fix setup pf * kitchen fix for 0.14 * bump networking * bump iap example * switch back to 0.13 tests * fmt --- README.md | 1 - autogen/main/variables.tf.tmpl | 6 --- autogen/main/versions.tf.tmpl | 8 +--- autogen/safer-cluster/main.tf.tmpl | 2 - autogen/safer-cluster/variables.tf.tmpl | 6 --- autogen/safer-cluster/versions.tf.tmpl | 6 +-- .../private_zonal_with_networking/main.tf | 2 +- examples/safer_cluster_iap_bastion/bastion.tf | 2 +- .../simple_regional_with_networking/main.tf | 4 +- .../README.md | 1 - .../variables.tf | 6 --- .../versions.tf | 6 +-- modules/beta-private-cluster/README.md | 1 - modules/beta-private-cluster/variables.tf | 6 --- modules/beta-private-cluster/versions.tf | 6 +-- .../README.md | 1 - .../variables.tf | 6 --- .../versions.tf | 6 +-- modules/beta-public-cluster/README.md | 1 - modules/beta-public-cluster/variables.tf | 6 --- modules/beta-public-cluster/versions.tf | 6 +-- .../private-cluster-update-variant/README.md | 1 - .../variables.tf | 6 --- .../versions.tf | 6 +-- modules/private-cluster/README.md | 1 - modules/private-cluster/variables.tf | 6 --- modules/private-cluster/versions.tf | 6 +-- .../safer-cluster-update-variant/README.md | 1 - modules/safer-cluster-update-variant/main.tf | 2 - .../safer-cluster-update-variant/variables.tf | 6 --- .../safer-cluster-update-variant/versions.tf | 6 +-- modules/safer-cluster/README.md | 1 - modules/safer-cluster/main.tf | 2 - modules/safer-cluster/variables.tf | 6 --- modules/safer-cluster/versions.tf | 6 +-- test/setup/main.tf | 39 +++++++++---------- test/setup/versions.tf | 4 +- variables.tf | 6 --- versions.tf | 6 +-- 39 files changed, 36 insertions(+), 164 deletions(-) diff --git a/README.md b/README.md index 4cedbec76..7149dfaa8 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,6 @@ Then perform the following commands on the root folder: | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | basic\_auth\_password | The password to be used with Basic Authentication. | `string` | `""` | no | diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl index 605116216..8e55b6a0d 100644 --- a/autogen/main/variables.tf.tmpl +++ b/autogen/main/variables.tf.tmpl @@ -626,9 +626,3 @@ variable "enable_tpu" { default = false } {% endif %} - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl index fbc50b761..051210a05 100644 --- a/autogen/main/versions.tf.tmpl +++ b/autogen/main/versions.tf.tmpl @@ -17,10 +17,6 @@ {% set module_path_str = module_path|string %} {% set module_registry_name = module_path_str.split('/')[-1] %} -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -36,7 +32,7 @@ terraform { } } provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0" } {% else %} required_providers { @@ -50,7 +46,7 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0" } {% endif %} } diff --git a/autogen/safer-cluster/main.tf.tmpl b/autogen/safer-cluster/main.tf.tmpl index 230f51386..8432943d9 100644 --- a/autogen/safer-cluster/main.tf.tmpl +++ b/autogen/safer-cluster/main.tf.tmpl @@ -168,6 +168,4 @@ module "gke" { gce_pd_csi_driver = var.gce_pd_csi_driver notification_config_topic = var.notification_config_topic - - _parent_module = local.blueprint_name } diff --git a/autogen/safer-cluster/variables.tf.tmpl b/autogen/safer-cluster/variables.tf.tmpl index 6a8a8c4e2..5d7eaea69 100644 --- a/autogen/safer-cluster/variables.tf.tmpl +++ b/autogen/safer-cluster/variables.tf.tmpl @@ -375,9 +375,3 @@ variable "notification_config_topic" { description = "The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}." default = "" } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/autogen/safer-cluster/versions.tf.tmpl b/autogen/safer-cluster/versions.tf.tmpl index c0b4f30be..a10644f34 100644 --- a/autogen/safer-cluster/versions.tf.tmpl +++ b/autogen/safer-cluster/versions.tf.tmpl @@ -19,14 +19,10 @@ {% set module_path_str = module_path|string %} {% set module_registry_name = module_path_str.split('/')[-1] %} -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0"])) -} - terraform { required_version = ">=0.13" provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine{% if module_registry_name %}:{{ module_registry_name }}{% endif %}/v14.0.0" } } diff --git a/examples/private_zonal_with_networking/main.tf b/examples/private_zonal_with_networking/main.tf index 1d87c43ee..605c651bb 100644 --- a/examples/private_zonal_with_networking/main.tf +++ b/examples/private_zonal_with_networking/main.tf @@ -25,7 +25,7 @@ provider "kubernetes" { module "gcp-network" { source = "terraform-google-modules/network/google" - version = "~> 2.5" + version = "~> 3.1" project_id = var.project_id network_name = var.network diff --git a/examples/safer_cluster_iap_bastion/bastion.tf b/examples/safer_cluster_iap_bastion/bastion.tf index d054b06e6..f998ea801 100644 --- a/examples/safer_cluster_iap_bastion/bastion.tf +++ b/examples/safer_cluster_iap_bastion/bastion.tf @@ -28,7 +28,7 @@ data "template_file" "startup_script" { module "bastion" { source = "terraform-google-modules/bastion-host/google" - version = "~> 2.0" + version = "~> 3.0" network = module.vpc.network_self_link subnet = module.vpc.subnets_self_links[0] project = module.enabled_google_apis.project_id diff --git a/examples/simple_regional_with_networking/main.tf b/examples/simple_regional_with_networking/main.tf index a776747b9..631411a96 100644 --- a/examples/simple_regional_with_networking/main.tf +++ b/examples/simple_regional_with_networking/main.tf @@ -15,7 +15,7 @@ */ provider "google" { - version = "~> 3.42.0" + version = "~> 3.45.0" } data "google_client_config" "default" {} @@ -29,7 +29,7 @@ provider "kubernetes" { module "gcp-network" { source = "terraform-google-modules/network/google" - version = "~> 2.5" + version = "~> 3.1" project_id = var.project_id network_name = var.network diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md index 79844c9b7..211251033 100644 --- a/modules/beta-private-cluster-update-variant/README.md +++ b/modules/beta-private-cluster-update-variant/README.md @@ -154,7 +154,6 @@ Then perform the following commands on the root folder: | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no | diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf index e1bfe60f4..4be21a5d7 100644 --- a/modules/beta-private-cluster-update-variant/variables.tf +++ b/modules/beta-private-cluster-update-variant/variables.tf @@ -602,9 +602,3 @@ variable "enable_tpu" { description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!" default = false } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf index df02dd83b..4b04fefaa 100644 --- a/modules/beta-private-cluster-update-variant/versions.tf +++ b/modules/beta-private-cluster-update-variant/versions.tf @@ -15,10 +15,6 @@ */ -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -33,6 +29,6 @@ terraform { } } provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster-update-variant/v14.0.0" } } diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md index 60c929e0e..71c854e45 100644 --- a/modules/beta-private-cluster/README.md +++ b/modules/beta-private-cluster/README.md @@ -132,7 +132,6 @@ Then perform the following commands on the root folder: | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no | diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf index e1bfe60f4..4be21a5d7 100644 --- a/modules/beta-private-cluster/variables.tf +++ b/modules/beta-private-cluster/variables.tf @@ -602,9 +602,3 @@ variable "enable_tpu" { description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!" default = false } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf index 48ef1b70f..e7736be82 100644 --- a/modules/beta-private-cluster/versions.tf +++ b/modules/beta-private-cluster/versions.tf @@ -15,10 +15,6 @@ */ -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-private-cluster/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -33,6 +29,6 @@ terraform { } } provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-private-cluster/v14.0.0" } } diff --git a/modules/beta-public-cluster-update-variant/README.md b/modules/beta-public-cluster-update-variant/README.md index 4466e33c2..82c54f06a 100644 --- a/modules/beta-public-cluster-update-variant/README.md +++ b/modules/beta-public-cluster-update-variant/README.md @@ -148,7 +148,6 @@ Then perform the following commands on the root folder: | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no | diff --git a/modules/beta-public-cluster-update-variant/variables.tf b/modules/beta-public-cluster-update-variant/variables.tf index df550dce4..83089297c 100644 --- a/modules/beta-public-cluster-update-variant/variables.tf +++ b/modules/beta-public-cluster-update-variant/variables.tf @@ -571,9 +571,3 @@ variable "enable_tpu" { description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!" default = false } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf index 6c78518c5..92c92dd2b 100644 --- a/modules/beta-public-cluster-update-variant/versions.tf +++ b/modules/beta-public-cluster-update-variant/versions.tf @@ -15,10 +15,6 @@ */ -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -33,6 +29,6 @@ terraform { } } provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster-update-variant/v14.0.0" } } diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md index 5a6fcc3a4..bd98596a3 100644 --- a/modules/beta-public-cluster/README.md +++ b/modules/beta-public-cluster/README.md @@ -126,7 +126,6 @@ Then perform the following commands on the root folder: | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no | diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf index df550dce4..83089297c 100644 --- a/modules/beta-public-cluster/variables.tf +++ b/modules/beta-public-cluster/variables.tf @@ -571,9 +571,3 @@ variable "enable_tpu" { description = "Enable Cloud TPU resources in the cluster. WARNING: changing this after cluster creation is destructive!" default = false } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf index 28d1ef092..830e800b7 100644 --- a/modules/beta-public-cluster/versions.tf +++ b/modules/beta-public-cluster/versions.tf @@ -15,10 +15,6 @@ */ -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:beta-public-cluster/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -33,6 +29,6 @@ terraform { } } provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:beta-public-cluster/v14.0.0" } } diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md index 67220000a..4ed14263c 100644 --- a/modules/private-cluster-update-variant/README.md +++ b/modules/private-cluster-update-variant/README.md @@ -151,7 +151,6 @@ Then perform the following commands on the root folder: | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | basic\_auth\_password | The password to be used with Basic Authentication. | `string` | `""` | no | diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf index 7c36d0452..4559296d6 100644 --- a/modules/private-cluster-update-variant/variables.tf +++ b/modules/private-cluster-update-variant/variables.tf @@ -468,9 +468,3 @@ variable "impersonate_service_account" { default = "" } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf index a2a076c51..8a5771b57 100644 --- a/modules/private-cluster-update-variant/versions.tf +++ b/modules/private-cluster-update-variant/versions.tf @@ -15,10 +15,6 @@ */ -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:private-cluster-update-variant/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -33,6 +29,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster-update-variant/v14.0.0" } } diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md index 9b8a11602..1742a5437 100644 --- a/modules/private-cluster/README.md +++ b/modules/private-cluster/README.md @@ -129,7 +129,6 @@ Then perform the following commands on the root folder: | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | add\_shadow\_firewall\_rules | Create GKE shadow firewall (the same as default firewall rules with firewall logs enabled). | `bool` | `false` | no | | basic\_auth\_password | The password to be used with Basic Authentication. | `string` | `""` | no | diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf index 7c36d0452..4559296d6 100644 --- a/modules/private-cluster/variables.tf +++ b/modules/private-cluster/variables.tf @@ -468,9 +468,3 @@ variable "impersonate_service_account" { default = "" } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf index 0c54ca265..93e5e3f2c 100644 --- a/modules/private-cluster/versions.tf +++ b/modules/private-cluster/versions.tf @@ -15,10 +15,6 @@ */ -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:private-cluster/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -33,6 +29,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:private-cluster/v14.0.0" } } diff --git a/modules/safer-cluster-update-variant/README.md b/modules/safer-cluster-update-variant/README.md index 0f86a5009..6b9392b65 100644 --- a/modules/safer-cluster-update-variant/README.md +++ b/modules/safer-cluster-update-variant/README.md @@ -201,7 +201,6 @@ For simplicity, we suggest using `roles/container.admin` and | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no | | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no | diff --git a/modules/safer-cluster-update-variant/main.tf b/modules/safer-cluster-update-variant/main.tf index 1d48fd9aa..36d63d05e 100644 --- a/modules/safer-cluster-update-variant/main.tf +++ b/modules/safer-cluster-update-variant/main.tf @@ -164,6 +164,4 @@ module "gke" { gce_pd_csi_driver = var.gce_pd_csi_driver notification_config_topic = var.notification_config_topic - - _parent_module = local.blueprint_name } diff --git a/modules/safer-cluster-update-variant/variables.tf b/modules/safer-cluster-update-variant/variables.tf index c5bfbde88..2bb14cbe7 100644 --- a/modules/safer-cluster-update-variant/variables.tf +++ b/modules/safer-cluster-update-variant/variables.tf @@ -375,9 +375,3 @@ variable "notification_config_topic" { description = "The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}." default = "" } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/safer-cluster-update-variant/versions.tf b/modules/safer-cluster-update-variant/versions.tf index 4e1f8b11e..c3d0653a2 100644 --- a/modules/safer-cluster-update-variant/versions.tf +++ b/modules/safer-cluster-update-variant/versions.tf @@ -17,14 +17,10 @@ // This file was automatically generated from a template in ./autogen/safer-cluster -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:safer-cluster-update-variant/v14.0.0"])) -} - terraform { required_version = ">=0.13" provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster-update-variant/v14.0.0" } } diff --git a/modules/safer-cluster/README.md b/modules/safer-cluster/README.md index 0f86a5009..6b9392b65 100644 --- a/modules/safer-cluster/README.md +++ b/modules/safer-cluster/README.md @@ -201,7 +201,6 @@ For simplicity, we suggest using `roles/container.admin` and | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_parent\_module | (Internal) Parent module which should be referenced in API calls. | `string` | `""` | no | | add\_cluster\_firewall\_rules | Create additional firewall rules | `bool` | `false` | no | | authenticator\_security\_group | The name of the RBAC security group for use with Google security groups in Kubernetes RBAC. Group name must be in format gke-security-groups@yourdomain.com | `string` | `null` | no | | cloudrun | (Beta) Enable CloudRun addon | `bool` | `false` | no | diff --git a/modules/safer-cluster/main.tf b/modules/safer-cluster/main.tf index 7ceb2b286..3b09c1dca 100644 --- a/modules/safer-cluster/main.tf +++ b/modules/safer-cluster/main.tf @@ -164,6 +164,4 @@ module "gke" { gce_pd_csi_driver = var.gce_pd_csi_driver notification_config_topic = var.notification_config_topic - - _parent_module = local.blueprint_name } diff --git a/modules/safer-cluster/variables.tf b/modules/safer-cluster/variables.tf index c5bfbde88..2bb14cbe7 100644 --- a/modules/safer-cluster/variables.tf +++ b/modules/safer-cluster/variables.tf @@ -375,9 +375,3 @@ variable "notification_config_topic" { description = "The desired Pub/Sub topic to which notifications will be sent by GKE. Format is projects/{project}/topics/{topic}." default = "" } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/modules/safer-cluster/versions.tf b/modules/safer-cluster/versions.tf index 924abba92..b311c350c 100644 --- a/modules/safer-cluster/versions.tf +++ b/modules/safer-cluster/versions.tf @@ -17,14 +17,10 @@ // This file was automatically generated from a template in ./autogen/safer-cluster -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine:safer-cluster/v14.0.0"])) -} - terraform { required_version = ">=0.13" provider_meta "google-beta" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:safer-cluster/v14.0.0" } } diff --git a/test/setup/main.tf b/test/setup/main.tf index 832d7e43f..b690796fb 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -20,14 +20,13 @@ resource "random_id" "random_project_id_suffix" { module "gke-project-1" { source = "terraform-google-modules/project-factory/google" - version = "~> 9.1.0" + version = "~> 10.1" - name = "ci-gke-${random_id.random_project_id_suffix.hex}" - random_project_id = true - org_id = var.org_id - folder_id = var.folder_id - billing_account = var.billing_account - skip_gcloud_download = true + name = "ci-gke-${random_id.random_project_id_suffix.hex}" + random_project_id = true + org_id = var.org_id + folder_id = var.folder_id + billing_account = var.billing_account auto_create_network = true @@ -49,14 +48,13 @@ module "gke-project-1" { module "gke-project-2" { source = "terraform-google-modules/project-factory/google" - version = "~> 9.1.0" + version = "~> 10.1" - name = "ci-gke-${random_id.random_project_id_suffix.hex}" - random_project_id = true - org_id = var.org_id - folder_id = var.folder_id - billing_account = var.billing_account - skip_gcloud_download = true + name = "ci-gke-${random_id.random_project_id_suffix.hex}" + random_project_id = true + org_id = var.org_id + folder_id = var.folder_id + billing_account = var.billing_account activate_apis = [ "cloudkms.googleapis.com", @@ -78,14 +76,13 @@ module "gke-project-2" { # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project module "gke-project-asm" { source = "terraform-google-modules/project-factory/google" - version = "~> 9.1.0" + version = "~> 10.1" - name = "ci-gke-asm-${random_id.random_project_id_suffix.hex}" - random_project_id = true - org_id = var.org_id - folder_id = var.folder_id - billing_account = var.billing_account - skip_gcloud_download = true + name = "ci-gke-asm-${random_id.random_project_id_suffix.hex}" + random_project_id = true + org_id = var.org_id + folder_id = var.folder_id + billing_account = var.billing_account activate_apis = [ "logging.googleapis.com", diff --git a/test/setup/versions.tf b/test/setup/versions.tf index 494d156e5..1963f1ed9 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -19,9 +19,9 @@ terraform { } provider "google" { - version = "3.42.0" + version = "3.50.0" } provider "google-beta" { - version = "3.42.0" + version = "3.50.0" } diff --git a/variables.tf b/variables.tf index c75ed61b1..9e43eaa5c 100644 --- a/variables.tf +++ b/variables.tf @@ -444,9 +444,3 @@ variable "impersonate_service_account" { default = "" } - -variable "_parent_module" { - type = string - description = "(Internal) Parent module which should be referenced in API calls." - default = "" -} diff --git a/versions.tf b/versions.tf index 6e1ade6e8..c69599265 100644 --- a/versions.tf +++ b/versions.tf @@ -15,10 +15,6 @@ */ -locals { - blueprint_name = join("/", compact([var._parent_module, "terraform-google-kubernetes-engine/v14.0.0"])) -} - terraform { required_version = ">=0.13" @@ -33,6 +29,6 @@ terraform { } } provider_meta "google" { - module_name = "blueprints/terraform/${local.blueprint_name}" + module_name = "blueprints/terraform/terraform-google-kubernetes-engine/v14.0.0" } }