feat!: promote gke_backup_agent_config to ga (terraform-google-modules#1513)

Author: Tolsee

README.md

@@ -158,6 +158,7 @@ Then perform the following commands on the root folder:
 | firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
 | gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
 | gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
+| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
 | http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |

autogen/main/cluster.tf.tmpl

@@ -259,6 +259,14 @@ resource "google_container_cluster" "primary" {
  enabled = gce_persistent_disk_csi_driver_config.value.enabled
  }
  }
+
+ dynamic "gke_backup_agent_config" {
+ for_each = local.gke_backup_agent_config
+
+ content {
+ enabled = gke_backup_agent_config.value.enabled
+ }
+ }
  {% endif %}
  {% if beta_cluster and autopilot_cluster != true %}
 
@@ -282,14 +290,6 @@ resource "google_container_cluster" "primary" {
  config_connector_config {
  enabled = var.config_connector
  }
-
- dynamic "gke_backup_agent_config" {
- for_each = local.gke_backup_agent_config
-
- content {
- enabled = gke_backup_agent_config.value.enabled
- }
- }
  {% endif %}
  }
 

autogen/main/main.tf.tmpl

@@ -103,6 +103,7 @@ locals {
  }]
  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
+ gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
 {% 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 }]
 {% endif %}
 
  cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{

autogen/main/variables.tf.tmpl

@@ -641,6 +641,12 @@ variable "gce_pd_csi_driver" {
  default = true
 }
 
+variable "gke_backup_agent_config" {
+ type = bool
+ description = "Whether Backup for GKE agent is enabled for this cluster."
+ default = false
+}
+
 {% endif %}
 variable "timeouts" {
  type = map(string)
@@ -703,12 +709,6 @@ variable "config_connector" {
  default = false
 }
 
-variable "gke_backup_agent_config" {
- type = bool
- description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
- default = false
-}
-
 variable "cloudrun" {
  description = "(Beta) Enable CloudRun addon"
  default = false

autogen/main/versions.tf.tmpl

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

cluster.tf

@@ -184,6 +184,14 @@ resource "google_container_cluster" "primary" {
  enabled = gce_persistent_disk_csi_driver_config.value.enabled
  }
  }
+
+ dynamic "gke_backup_agent_config" {
+ for_each = local.gke_backup_agent_config
+
+ content {
+ enabled = gke_backup_agent_config.value.enabled
+ }
+ }
  }
 
  datapath_provider = var.datapath_provider

main.tf

@@ -85,6 +85,7 @@ locals {
  }]
  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
+ gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
 
  cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
  security_group = var.authenticator_security_group

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

@@ -21,7 +21,7 @@ terraform {
  required_providers {
  google-beta = {
  source = "hashicorp/google-beta"
- version = ">= 4.46.0, < 5.0"
+ version = ">= 4.47.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.46.0, < 5.0"
+ version = ">= 4.47.0, < 5.0"
  }
  kubernetes = {
  source = "hashicorp/kubernetes"

modules/beta-private-cluster-update-variant/README.md

@@ -203,7 +203,7 @@ Then perform the following commands on the root folder:
 | firewall\_priority | Priority rule for firewall rules | `number` | `1000` | no |
 | gateway\_api\_channel | The gateway api channel of this cluster. Accepted values are `CHANNEL_STANDARD` and `CHANNEL_DISABLED`. | `string` | `null` | no |
 | gce\_pd\_csi\_driver | Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | `bool` | `true` | no |
-| gke\_backup\_agent\_config | (Beta) Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
+| gke\_backup\_agent\_config | Whether Backup for GKE agent is enabled for this cluster. | `bool` | `false` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `false` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | `bool` | `true` | no |
 | http\_load\_balancing | Enable httpload balancer addon | `bool` | `true` | no |