Skip to content

Commit 6965dd8

Browse files
committed
Promote backup agent config to ga
1 parent d985879 commit 6965dd8

File tree

5 files changed

+18
-2
lines changed

5 files changed

+18
-2
lines changed

modules/beta-private-cluster/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ variable "config_connector" {
673673

674674
variable "gke_backup_agent_config" {
675675
type = bool
676-
description = "(Beta) Whether Backup for GKE agent is enabled for this cluster."
676+
description = "Whether Backup for GKE agent is enabled for this cluster."
677677
default = false
678678
}
679679

modules/beta-private-cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ terraform {
2121
required_providers {
2222
google-beta = {
2323
source = "hashicorp/google-beta"
24-
version = ">= 4.45.0, < 5.0"
24+
version = ">= 4.47.0, < 5.0"
2525
}
2626
kubernetes = {
2727
source = "hashicorp/kubernetes"

modules/private-cluster/cluster.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,14 @@ resource "google_container_cluster" "primary" {
159159
enabled = gce_persistent_disk_csi_driver_config.value.enabled
160160
}
161161
}
162+
163+
dynamic "gke_backup_agent_config" {
164+
for_each = local.gke_backup_agent_config
165+
166+
content {
167+
enabled = gke_backup_agent_config.value.enabled
168+
}
169+
}
162170
}
163171

164172
datapath_provider = var.datapath_provider

modules/private-cluster/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ locals {
8585
}]
8686
cluster_gce_pd_csi_config = var.gce_pd_csi_driver ? [{ enabled = true }] : [{ enabled = false }]
8787

88+
gke_backup_agent_config = var.gke_backup_agent_config ? [{ enabled = true }] : [{ enabled = false }]
89+
8890
cluster_authenticator_security_group = var.authenticator_security_group == null ? [] : [{
8991
security_group = var.authenticator_security_group
9092
}]

modules/private-cluster/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,3 +594,9 @@ variable "timeouts" {
594594
error_message = "Only create, update, delete timeouts can be specified."
595595
}
596596
}
597+
598+
variable "gke_backup_agent_config" {
599+
type = bool
600+
description = "Whether Backup for GKE agent is enabled for this cluster."
601+
default = false
602+
}

0 commit comments

Comments
 (0)