feat!: cost_management_config is out of beta now (terraform-google-modules#1470)

feat: cost_management_config is out of beta now move the config outside the logic of beta only Co-authored-by: Zackary Maupin <zackary.maupin@wunderkind.co>

Author: zmaupin

README.md

@@ -147,6 +147,7 @@ Then perform the following commands on the root folder:
 | disable\_legacy\_metadata\_endpoints | Disable the /0.1/ and /v1beta1/ metadata server endpoints on the node. Changing this value will cause all node pools to be recreated. | `bool` | `true` | no |
 | dns\_cache | The status of the NodeLocal DNSCache addon. | `bool` | `false` | no |
 | enable\_binary\_authorization | Enable BinAuthZ Admission controller | `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\_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\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster | `bool` | `true` | no |

autogen/main/cluster.tf.tmpl

@@ -53,13 +53,13 @@ resource "google_container_cluster" "primary" {
  channel = release_channel.value.channel
  }
  }
-{% if beta_cluster %}
  dynamic "cost_management_config" {
  for_each = var.enable_cost_allocation ? [1] : []
  content {
  enabled = var.enable_cost_allocation
  }
  }
+{% if beta_cluster %}
  dynamic "confidential_nodes" {
  for_each = local.confidential_node_config
  content {
@@ -598,7 +598,7 @@ resource "google_container_node_pool" "windows_pools" {
  for_each = local.node_pools
  {% else %}
  for_each = local.windows_node_pools
- {% endif %} 
+ {% endif %}
  {% if update_variant %}
  name = { for k, v in random_id.name : k => v.hex }[each.key]
  {% else %}
@@ -645,7 +645,7 @@ resource "google_container_node_pool" "windows_pools" {
  type = lookup(placement_policy.value, "placement_policy", null)
  }
  }
- 
+
  dynamic "network_config" {
  for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
  content {

autogen/main/variables.tf.tmpl

@@ -196,13 +196,11 @@ variable "node_pools_linux_node_configs_sysctls" {
 {% endif %}
 {% endif %}
 
-{% if beta_cluster %}
 variable "enable_cost_allocation" {
  type = bool
  description = "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"
  default = false
 }
-{% endif %}
 variable "resource_usage_export_dataset_id" {
  type = string
  description = "The ID of a BigQuery Dataset for using BigQuery as the destination of resource usage export."

autogen/main/versions.tf.tmpl

@@ -24,7 +24,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.36.0, < 5.0"
+ version = ">= 4.42.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

cluster.tf

@@ -47,6 +47,12 @@ resource "google_container_cluster" "primary" {
  channel = release_channel.value.channel
  }
  }
+ dynamic "cost_management_config" {
+ for_each = var.enable_cost_allocation ? [1] : []
+ content {
+ enabled = var.enable_cost_allocation
+ }
+ }
 
  subnetwork = "projects/${local.network_project_id}/regions/${local.region}/subnetworks/${var.subnetwork}"
 
@@ -303,7 +309,6 @@ resource "google_container_cluster" "primary" {
 resource "google_container_node_pool" "pools" {
  provider = google
  for_each = local.node_pools
-
  name = each.key
  project = var.project_id
  location = local.location
@@ -458,7 +463,6 @@ resource "google_container_node_pool" "pools" {
 resource "google_container_node_pool" "windows_pools" {
  provider = google
  for_each = local.windows_node_pools
-
  name = each.key
  project = var.project_id
  location = local.location

docs/upgrading_to_v24.0.md

@@ -59,4 +59,4 @@ To avoid this, it is possible to edit the remote state of the `random_id` resour
 
 ### Minimum Google Provider versions
 
-Minimum Google Provider versions have been updated to `4.36.0`.
+Minimum Google Provider versions have been updated to `4.42.0`.

examples/simple_regional/main.tf

@@ -38,6 +38,7 @@ module "gke" {
  ip_range_services = var.ip_range_services
  create_service_account = false
  service_account = var.compute_engine_service_account
+ enable_cost_allocation = true
  enable_binary_authorization = var.enable_binary_authorization
  skip_provisioners = var.skip_provisioners
 }

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

@@ -21,7 +21,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.36.0, < 5.0"
+ version = ">= 4.42.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

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

@@ -21,7 +21,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.36.0, < 5.0"
+ version = ">= 4.42.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

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

@@ -524,7 +524,6 @@ resource "random_id" "name" {
 resource "google_container_node_pool" "pools" {
  provider = google-beta
  for_each = local.node_pools
-
  name = { for k, v in random_id.name : k => v.hex }[each.key]
  project = var.project_id
  location = local.location
@@ -732,7 +731,6 @@ resource "google_container_node_pool" "pools" {
 resource "google_container_node_pool" "windows_pools" {
  provider = google-beta
  for_each = local.windows_node_pools
-
  name = { for k, v in random_id.name : k => v.hex }[each.key]
  project = var.project_id
  location = local.location