feat!: Promote managed_prometheus to GA (terraform-google-modules#1505)

Co-authored-by: Eric Zhao <zhaoe@google.com>

Author: IIBenII

README.md

@@ -148,6 +148,7 @@ Then perform the following commands on the root folder:
 | 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\_kubernetes\_alpha | Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days. | `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 |
@@ -168,12 +169,15 @@ Then perform the following commands on the root folder:
 | ip\_range\_services | The _name_ of the secondary subnet range to use for services | `string` | n/a | yes |
 | issue\_client\_certificate | Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive! | `bool` | `false` | no |
 | kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | `string` | `"latest"` | no |
+| logging\_enabled\_components | List of services to monitor: SYSTEM\_COMPONENTS, WORKLOADS. Empty list is default GKE configuration. | `list(string)` | `[]` | no |
 | logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | `string` | `"logging.googleapis.com/kubernetes"` | no |
 | maintenance\_end\_time | Time window specified for recurring maintenance operations in RFC3339 format | `string` | `""` | no |
 | maintenance\_exclusions | List of maintenance exclusions. A cluster can have up to three | `list(object({ name = string, start_time = string, end_time = string, exclusion_scope = string }))` | `[]` | no |
 | maintenance\_recurrence | Frequency of the recurring maintenance window in RFC5545 format. | `string` | `""` | no |
 | maintenance\_start\_time | Time window specified for daily or recurring maintenance operations in RFC3339 format | `string` | `"05:00"` | no |
 | master\_authorized\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |
+| monitoring\_enable\_managed\_prometheus | Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |
+| monitoring\_enabled\_components | List of services to monitor: SYSTEM\_COMPONENTS, WORKLOADS (provider version >= 3.89.0). Empty list is default GKE configuration. | `list(string)` | `[]` | no |
 | monitoring\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `"monitoring.googleapis.com/kubernetes"` | no |
 | name | The name of the cluster (required) | `string` | n/a | yes |
 | network | The VPC network to host the cluster in (required) | `string` | n/a | yes |

autogen/main/cluster.tf.tmpl

@@ -92,21 +92,31 @@ resource "google_container_cluster" "primary" {
  type = var.cluster_telemetry_type
  }
  }
+{% endif %}
+{% if autopilot_cluster != true %}
  # only one of logging/monitoring_service or logging/monitoring_config can be specified
- logging_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.logging_service
+ {% if beta_cluster %}
+ logging_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.logging_service
+ {% else %}
+ logging_service = local.logmon_config_is_set ? null : var.logging_service
+ {% endif %}
  dynamic "logging_config" {
  for_each = length(var.logging_enabled_components) > 0 ? [1] : []
 
  content {
  enable_components = var.logging_enabled_components
  }
  }
+ {% if beta_cluster %}
  monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
+ {% else %}
+ monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
+ {% endif %}
  dynamic "monitoring_config" {
  for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
 
  content {
- enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : null
+ enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
 
  dynamic "managed_prometheus" {
  for_each = var.monitoring_enable_managed_prometheus ? [1] : []
@@ -117,22 +127,6 @@ resource "google_container_cluster" "primary" {
  }
  }
  }
-{% else %}
- logging_service = var.logging_service
- monitoring_service = var.monitoring_service
- {% if beta_cluster %}
- dynamic "monitoring_config" {
- for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
- content {
- managed_prometheus {
- enabled = var.monitoring_enable_managed_prometheus
- }
- }
- }
- {% endif %}
-{% endif %}
- {% if autopilot_cluster != true %}
  cluster_autoscaling {
  enabled = var.cluster_autoscaling.enabled
  dynamic "auto_provisioning_defaults" {
@@ -158,7 +152,7 @@ resource "google_container_cluster" "primary" {
  }
  }
  }
- {% endif %}
+{% endif %}
  {% if autopilot_cluster == true %}
  cluster_autoscaling {
  dynamic "auto_provisioning_defaults" {
@@ -184,9 +178,10 @@ resource "google_container_cluster" "primary" {
  }
  }
 
+ enable_kubernetes_alpha = var.enable_kubernetes_alpha
+
  {% if beta_cluster %}
  enable_intranode_visibility = var.enable_intranode_visibility
- enable_kubernetes_alpha = var.enable_kubernetes_alpha
  enable_tpu = var.enable_tpu
 
  dynamic "pod_security_policy_config" {

autogen/main/main.tf.tmpl

@@ -102,6 +102,7 @@ locals {
  provider = null
  }]
  cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
 {% endif %}
 {% if beta_cluster and autopilot_cluster != true %}
  cluster_cloudrun_config_load_balancer_config = (var.cloudrun && var.cloudrun_load_balancer_type != "") ? {
@@ -117,7 +118,6 @@ locals {
  ] : []
  cluster_cloudrun_enabled = var.cloudrun
  gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
- logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
 {% endif %}
 
  cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{

autogen/main/variables.tf.tmpl

@@ -651,33 +651,33 @@ variable "timeouts" {
  error_message = "Only create, update, delete timeouts can be specified."
  }
 }
-{% if beta_cluster %}
- {% if autopilot_cluster != true %}
 
-variable "enable_kubernetes_alpha" {
+{% if autopilot_cluster != true %}
+variable "monitoring_enable_managed_prometheus" {
  type = bool
- description = "Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days."
+ description = "Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled."
  default = false
 }
 
-variable "logging_enabled_components" {
+variable "monitoring_enabled_components" {
  type = list(string)
- description = "List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration."
+ description = "List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS (provider version >= 3.89.0). Empty list is default GKE configuration."
  default = []
 }
 
-variable "monitoring_enabled_components" {
+variable "logging_enabled_components" {
  type = list(string)
- description = "List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS (provider version >= 3.89.0). Empty list is default GKE configuration."
+ description = "List of services to monitor: SYSTEM_COMPONENTS, WORKLOADS. Empty list is default GKE configuration."
  default = []
 }
- {% endif %}
 
-variable "monitoring_enable_managed_prometheus" {
+variable "enable_kubernetes_alpha" {
  type = bool
- description = "(Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled."
+ description = "Whether to enable Kubernetes Alpha features for this cluster. Note that when this option is enabled, the cluster cannot be upgraded and will be automatically deleted after 30 days."
  default = false
 }
+{% endif %}
+{% if beta_cluster %}
  {% if autopilot_cluster != true %}
 
 variable "istio" {

autogen/main/versions.tf.tmpl

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

cluster.tf

@@ -71,8 +71,31 @@ resource "google_container_cluster" "primary" {
 
  min_master_version = var.release_channel == null || var.release_channel == "UNSPECIFIED" ? local.master_version : null
 
- logging_service = var.logging_service
- monitoring_service = var.monitoring_service
+ # only one of logging/monitoring_service or logging/monitoring_config can be specified
+ logging_service = local.logmon_config_is_set ? null : var.logging_service
+ dynamic "logging_config" {
+ for_each = length(var.logging_enabled_components) > 0 ? [1] : []
+
+ content {
+ enable_components = var.logging_enabled_components
+ }
+ }
+ monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
+ dynamic "monitoring_config" {
+ for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
+
+ content {
+ enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
+
+ dynamic "managed_prometheus" {
+ for_each = var.monitoring_enable_managed_prometheus ? [1] : []
+
+ content {
+ enabled = var.monitoring_enable_managed_prometheus
+ }
+ }
+ }
+ }
  cluster_autoscaling {
  enabled = var.cluster_autoscaling.enabled
  dynamic "auto_provisioning_defaults" {
@@ -105,6 +128,8 @@ resource "google_container_cluster" "primary" {
  }
  }
 
+ enable_kubernetes_alpha = var.enable_kubernetes_alpha
+
  dynamic "master_authorized_networks_config" {
  for_each = local.master_authorized_networks_config
  content {

main.tf

@@ -84,6 +84,7 @@ locals {
  provider = null
  }]
  cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
+ logmon_config_is_set = length(var.logging_enabled_components) > 0 || length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus
 
  cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
  security_group = var.authenticator_security_group

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

@@ -111,7 +111,6 @@ Then perform the following commands on the root folder:
 | master\_authorized\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |
 | master\_global\_access\_enabled | Whether the cluster master is accessible globally (from any region) or only within the same region as the private endpoint. | `bool` | `true` | no |
 | master\_ipv4\_cidr\_block | (Beta) The IP range in CIDR notation to use for the hosted master network | `string` | `"10.0.0.0/28"` | no |
-| monitoring\_enable\_managed\_prometheus | (Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled. | `bool` | `false` | no |
 | monitoring\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `"monitoring.googleapis.com/kubernetes"` | no |
 | name | The name of the cluster (required) | `string` | n/a | yes |
 | network | The VPC network to host the cluster in (required) | `string` | n/a | yes |

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

@@ -69,17 +69,6 @@ resource "google_container_cluster" "primary" {
 
  min_master_version = var.release_channel == null || var.release_channel == "UNSPECIFIED" ? local.master_version : null
 
- logging_service = var.logging_service
- monitoring_service = var.monitoring_service
- dynamic "monitoring_config" {
- for_each = var.monitoring_enable_managed_prometheus ? [1] : []
-
- content {
- managed_prometheus {
- enabled = var.monitoring_enable_managed_prometheus
- }
- }
- }
  cluster_autoscaling {
  dynamic "auto_provisioning_defaults" {
  for_each = var.create_service_account ? [1] : []

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

@@ -423,8 +423,3 @@ variable "timeouts" {
  }
 }
 
-variable "monitoring_enable_managed_prometheus" {
- type = bool
- description = "(Beta) Configuration for Managed Service for Prometheus. Whether or not the managed collection is enabled."
- default = false
-}